diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-04-12 07:52:11 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-04-12 07:52:11 +0000 |
| commit | b52b60dab3ada8a461ff0fdd767b07d756d74a18 (patch) | |
| tree | 590526dd66f8838c6688e0d1ccdd2e7fbca379ac /usr.sbin/sysmerge/sysmerge.sh | |
| parent | 698a8afbb51921620e987ffc94814c323c114eb9 (diff) | |
Treat /etc/hosts the same way as /etc/group and /etc/master.passwd: make
it impossible to install a virgin one over the currently installed one.
from Mitja Muzenic, with a tweak
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 64f4c12ad0b..c5c220d7d22 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.36 2009/04/12 07:43:17 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.37 2009/04/12 07:52:10 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -416,7 +416,7 @@ diff_loop() { if [ -z "${BATCHMODE}" ]; then echo " Use 'd' to delete the temporary ${COMPFILE}" - if [ "${COMPFILE}" != "./etc/master.passwd" -a "${COMPFILE}" != "./etc/group" ]; then + if [ "${COMPFILE}" != "./etc/master.passwd" -a "${COMPFILE}" != "./etc/group" -a "${COMPFILE}" != "./etc/hosts" ]; then echo " Use 'i' to install the temporary ${COMPFILE}" fi if [ -z "${NO_INSTALLED}" -a -z "${IS_BINFILE}" ]; then @@ -438,7 +438,7 @@ diff_loop() { echo "\n===> Deleting ${COMPFILE}" ;; [iI]) - if [ "${COMPFILE}" != "./etc/master.passwd" -a "${COMPFILE}" != "./etc/group" ]; then + if [ "${COMPFILE}" != "./etc/master.passwd" -a "${COMPFILE}" != "./etc/group" -a "${COMPFILE}" != "./etc/hosts" ]; then echo "" if mm_install "${COMPFILE}"; then echo "===> ${COMPFILE} installed successfully" |