diff options
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 18 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 40 |
2 files changed, 17 insertions, 41 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index ae07f8523a6..2b7ff1dc56b 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.13 2008/12/17 09:17:47 jmc Exp $ +.\" $OpenBSD: sysmerge.8,v 1.14 2009/02/17 16:48:11 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: December 17 2008 $ +.Dd $Mdocdate: February 17 2009 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -81,14 +81,9 @@ when upgrading from binary sets. When run in .Em automatic mode -.Pq Fl a , +.Pq Fl a .Nm -will skip files with identical CVS Id, install missing ones and run commands -associated with the following special files if they were modified: -.Xr aliases 5 , -.Xr login.conf 5 , -.Xr MAKEDEV 8 , -.Xr passwd 5 . +will skip files with identical CVS Id and install missing ones. In .Em manual mode (the default unless @@ -151,9 +146,8 @@ The options are as follows: Automatic mode. If this option is specified, .Nm -will automatically install missing files, -create databases and device nodes, -and will disable strict file comparison when possible (using CVS Ids). +will automatically install missing files and disable strict file +comparison when possible (using CVS Ids). .It Fl b Batch mode. If this option is specified, diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 7b7e383410f..774428225d2 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.28 2009/02/17 10:57:59 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.29 2009/02/17 16:48:11 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -425,36 +425,21 @@ do_post() { fi if [ "${NEED_CAP_MKDB}" ]; then - echo -n "===> You installed a new ${DESTDIR}/etc/login.conf file, " - if [ "${AUTOMODE}" ]; then - echo "running cap_mkdb" - cap_mkdb ${DESTDIR}/etc/login.conf - else - echo "\n rebuild your login.conf database by running the following command as root:" - echo " 'cap_mkdb ${DESTDIR}/etc/login.conf'" - fi + echo -n "===> A new ${DESTDIR}/etc/login.conf file was installed, " + echo "running cap_mkdb..." + cap_mkdb ${DESTDIR}/etc/login.conf fi if [ "${NEED_PWD_MKDB}" ]; then echo -n "===> A new ${DESTDIR}/etc/master.passwd file was installed, " - if [ "${AUTOMODE}" ]; then - echo "running pwd_mkdb" - pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd - else - echo "\n rebuild your password files by running the following command as root:" - echo " 'pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'" - fi + echo "running pwd_mkdb..." + pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd fi if [ "${NEED_MAKEDEV}" ]; then echo -n "===> A new ${DESTDIR}/dev/MAKEDEV script was installed, " - if [ "${AUTOMODE}" ]; then - echo "running MAKEDEV" - cd ${DESTDIR}/dev && /bin/sh MAKEDEV all - else - echo "\n rebuild your device nodes by running the following command as root:" - echo " 'cd ${DESTDIR}/dev && /bin/sh MAKEDEV all'" - fi + echo "running MAKEDEV..." + cd ${DESTDIR}/dev && /bin/sh MAKEDEV all fi if [ "${NEED_NEWALIASES}" ]; then @@ -463,18 +448,15 @@ do_post() { echo "\n but the newaliases command is limited to the directories configured" echo " in sendmail.cf. Make sure to create your aliases database by" echo " hand when your sendmail configuration is done." - elif [ "${AUTOMODE}" ]; then - echo "running newaliases" - newaliases else - echo "\n rebuild your aliases database by running the following command as root:" - echo " 'newaliases'" + echo "running newaliases..." + newaliases fi fi clean_src - echo "===> Making sure your directory hierarchy has correct perms, running mtree" + echo "===> Making sure your directory hierarchy has correct perms, running mtree..." mtree -qdef ${DESTDIR}/etc/mtree/4.4BSD.dist -p ${DESTDIR:=/} -U 1> /dev/null FILES_IN_WRKDIR=`find ${WRKDIR} -type f -size +0 2>/dev/null` |