diff options
| -rw-r--r-- | distrib/miniroot/install.sh | 12 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 9cd908740e5..3a786529acb 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.254 2014/08/09 21:51:29 halex Exp $ +# $OpenBSD: install.sh,v 1.255 2014/08/10 14:59:22 rpe Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -98,11 +98,11 @@ while :; do # /tmp/fstab.$DISK is created here with 'disklabel -f' or # 'disklabel -F' depending on the value of $FSTABFLAG. rm -f /tmp/*.$DISK - md_prep_disklabel $DISK || { DISK= ; continue ; } + md_prep_disklabel $DISK || { DISK=; continue; } # Make sure there is a '/' mount point. grep -qs " / ffs " /tmp/fstab.$ROOTDISK || - { DISK= ; echo "'/' must be configured!" ; continue ; } + { DISK=; echo "'/' must be configured!"; continue; } if [[ -f /tmp/fstab.$DISK ]]; then # Avoid duplicate mount points on different disks. @@ -114,7 +114,7 @@ while :; do fi # Non-swap mountpoints must be in only one file. [[ /tmp/fstab.$DISK == $(grep -l " $_mp " /tmp/fstab.*) ]] || - { _rest=$DISK ; DISK= ; break ; } + { _rest=$DISK; DISK=; break; } done </tmp/fstab.$DISK if [[ -z $DISK ]]; then # Duplicate mountpoint. @@ -151,7 +151,7 @@ for _mp in $(bsort $_fsent); do # Only '/' is neither nodev nor nosuid. i.e. it can obviously # *always* contain devices or setuid programs. - [[ $_mp == / ]] && { echo " 1 1" ; continue ; } + [[ $_mp == / ]] && { echo " 1 1"; continue; } # Every other mounted filesystem is nodev. If the user chooses # to mount /dev as a separate filesystem, then on the user's @@ -259,7 +259,7 @@ fi # Append dhclient.conf to installed dhclient.conf. _f=dhclient.conf -[[ -f /tmp/$_f ]] && { cat /tmp/$_f >>/mnt/etc/$_f ; rm /tmp/$_f ; } +[[ -f /tmp/$_f ]] && { cat /tmp/$_f >>/mnt/etc/$_f; rm /tmp/$_f; } # Possible files to copy from /tmp: fstab hostname.* kbdtype mygate # myname ttys boot.conf resolv.conf sysctl.conf resolv.conf.tail diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 4270ba88dcf..3ecebc82097 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: upgrade.sh,v 1.78 2014/08/03 16:00:15 rpe Exp $ +# $OpenBSD: upgrade.sh,v 1.79 2014/08/10 14:59:22 rpe Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -52,16 +52,16 @@ done ROOTDEV=$resp echo -n "Checking root filesystem (fsck -fp /dev/$ROOTDEV)..." -fsck -fp /dev/$ROOTDEV >/dev/null 2>&1 || { echo "FAILED." ; exit ; } +fsck -fp /dev/$ROOTDEV >/dev/null 2>&1 || { echo "FAILED."; exit; } echo "OK." echo -n "Mounting root filesystem (mount -o ro /dev/$ROOTDEV /mnt)..." -mount -o ro /dev/$ROOTDEV /mnt || { echo "FAILED." ; exit ; } +mount -o ro /dev/$ROOTDEV /mnt || { echo "FAILED."; exit; } echo "OK." # The fstab, hosts and myname files are required. for _f in fstab hosts myname; do - [[ -f /mnt/etc/$_f ]] || { echo "No /mnt/etc/$_f!" ; exit ; } + [[ -f /mnt/etc/$_f ]] || { echo "No /mnt/etc/$_f!"; exit; } cp /mnt/etc/$_f /tmp/$_f done hostname $(stripcom /tmp/myname) @@ -79,7 +79,7 @@ munge_fstab check_fs # Mount filesystems in /etc/fstab. -umount /mnt || { echo "Can't umount $ROOTDEV!" ; exit ; } +umount /mnt || { echo "Can't umount $ROOTDEV!"; exit; } mount_fs feed_random |