Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate etc_release check, since etc/release is now part of base.tgz.

Browse Source 
Support '-s /path/to/etc.tgz' which extract the file to a scratch directory
and run the contained version of postinstall against that directory.
This saves about 5 tedious steps which I've done by hand when updating,
and the expense of some minor CPU time on each invocation of this method.

XXX: postinstall needs a man page.  pkill -HINTHINT wizd
This commit is contained in:
lukem 2005-03-08 14:09:25 +00:00
parent a0f802e2ac
commit 8286cd5e07
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
etc/postinstall
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: postinstall,v 1.91 2005/03/01 16:29:44 christos Exp $
# $NetBSD: postinstall,v 1.92 2005/03/08 14:09:25 lukem Exp $
#
# Copyright (c) 2002-2005 The NetBSD Foundation, Inc.
# All rights reserved.
@ -50,9 +50,7 @@
# - differentiate between failures caused by missing source
# and real failures
# - install moduli into usr/share/examples/ssh and use from there?
# - allow installation with "etc.tgz" as source file ?
# - differentiate between "needs fix" versus "can't fix" issues
# - deprecate etc_release now that it's part of the base set ?
#
#
@ -503,23 +501,6 @@ do_postinstall()
postinstall
}
#
# release
#
additem etc_release "/etc/release being up to date"
do_etc_release()
{
[ -n "$1" ] || err 2 "USAGE: do_etc_release fix|check"
if [ -f "${SRC_DIR}/etc/Makefile" -a \
! -f "${SRC_DIR}/etc/release" ] ; then
msg "etc/release is built by ${SRC_DIR}/etc/Makefile; skipping ${op}"
return 0
fi
compare_dir $1 ${SRC_DIR}/etc ${DEST_DIR}/etc 555 \
release
}
#
# defaults
#
@ -994,7 +975,7 @@ do_sendmail()
_notfixed=""
if [ "${_cfversion}" -lt 10 ]; then
# XXX no fix here
#XXX: no fix here
if [ "${_op}" = "fix" ]; then
_notfixed=${NOT_FIXED}
fi
@ -1162,6 +1143,35 @@ main()
shift $((${OPTIND} - 1))
[ $# -gt 0 ] || usage
#
# If '-s etc.tgz', extract etc.tgz to a scratch directory
# and invoke the copy of etc/postinstall contained within.
#
if [ -f "${SRC_DIR}" ]; then
ETCTGZDIR="${SCRATCHDIR}/etc.tgz"
msg "SRC_DIR ${SRC_DIR} is a file; temporarily extracting to ${ETCTGZDIR}"
if ! mkdir "${ETCTGZDIR}"; then
err 1 "Can't create ${ETCTGZDIR}"
fi
cat "${SRC_DIR}" | (
cd "${ETCTGZDIR}" &&
tar -zxf -
) || err 1 "Can't extract ${SRC_DIR}"
if [ ! -f "${ETCTGZDIR}/etc/postinstall" ]; then
err 1 "Can't find etc/postinstall in ${SRC_DIR}"
fi
msg "Invoking ${ETCTGZDIR}/etc/postinstall -s ${ETCTGZDIR} -d ${DEST_DIR} -m ${MACHINE} -a ${MACHINE_ARCH} $@"
"${ETCTGZDIR}/etc/postinstall" -s "${ETCTGZDIR}" \
-d "${DEST_DIR}" -m "${MACHINE}" -a "${MACHINE_ARCH}" "$@"
failed=$?
#XXX: need to improve the following ...
cat <<_Fix_my_paths_
Temporary paths will be wrong; try the following instead:
${0} -s ${SRC_DIR}
_Fix_my_paths_
exit $?
fi
[ -d "${SRC_DIR}" ] || err 1 "${SRC_DIR} is not a directory"
[ -d "${DEST_DIR}" ] || err 1 "${DEST_DIR} is not a directory"
[ -n "${MACHINE}" ] || err 1 "\${MACHINE} is not defined"