diff options
| author |   krw <krw@openbsd.org> | 2005-03-26 05:08:26 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2005-03-26 05:08:26 +0000 |
| commit | 4e95dff3e465463854bff2bca058667faa0c7b80 (patch) | |
| tree | 6b13bf9c3c5b23236100deadd1fbb965b652ac31 | |
| parent | Cleanup. Use defines, standard names, consistant comparison operators, etc. (diff) | |
| download | wireguard-openbsd-4e95dff3e465463854bff2bca058667faa0c7b80.tar.xz wireguard-openbsd-4e95dff3e465463854bff2bca058667faa0c7b80.zip | |
More cleanup. ${MODE} -> $MODE.
| -rw-r--r-- | distrib/miniroot/install.sub | 14 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 17be02b6c85..b73a1ca493c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.365 2005/03/26 03:54:40 krw Exp $ +# $OpenBSD: install.sub,v 1.366 2005/03/26 05:08:26 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback @@ -1262,9 +1262,9 @@ install_sets() { cat << __EOT -You will now specify the location and names of the ${MODE} sets you want to +You will now specify the location and names of the $MODE sets you want to load. You will be able to repeat this step until all of your sets have been -successfully loaded. If you are not sure what sets to ${MODE}, refer to the +successfully loaded. If you are not sure what sets to $MODE, refer to the installation notes for details on the contents of each. __EOT @@ -1335,7 +1335,7 @@ munge_fstab() { done < /tmp/fstab > /etc/fstab - # If no /etc/fstab was created, we have nowhere to ${MODE} to. + # If no /etc/fstab was created, we have nowhere to $MODE to. if [ ! -s /etc/fstab ]; then echo "Unable to create valid /etc/fstab." exit @@ -1358,7 +1358,7 @@ mount_fs() { cat << __EOT FATAL ERROR: Cannot mount filesystems. Double-check your configuration - and restart the ${MODE}. + and restart the $MODE. __EOT exit @@ -1532,12 +1532,12 @@ finish_up() { populateusrlocal - [ -x /mnt/${MODE}.site ] && /mnt/usr/sbin/chroot /mnt /${MODE}.site + [ -x /mnt/$MODE.site ] && /mnt/usr/sbin/chroot /mnt /$MODE.site # Pat on the back. cat << __EOT -CONGRATULATIONS! Your OpenBSD ${MODE} has been successfully completed! +CONGRATULATIONS! Your OpenBSD $MODE has been successfully completed! To boot the new system, enter halt at the command prompt. Once the system has halted, reset the machine and boot from the disk. __EOT diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index e09ff80aa70..4ec30a8c9c1 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: upgrade.sh,v 1.59 2004/10/02 18:45:08 krw Exp $ +# $OpenBSD: upgrade.sh,v 1.60 2005/03/26 05:08:26 krw Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -97,7 +97,7 @@ The fstab is configured as follows: $(< /tmp/fstab) -For the ${MODE}, filesystems in the fstab will be automatically mounted if the +For the $MODE, filesystems in the fstab will be automatically mounted if the 'noauto' option is absent, and /sbin/mount_<fstype> is found, and the fstype is not nfs. Non-ffs filesystems will be mounted read-only. |