diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-17 12:21:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-17 12:21:03 +0000 |
| commit | 2b8b3d08d6646a0fc2ee64d36e98b9f02900c651 (patch) | |
| tree | 7fa79b3dbcefc70f49344f374a710ced3f4e4955 | |
| parent | 14b3a83100cc02491df5394e364eaf1bede773ad (diff) | |
oops
| -rw-r--r-- | distrib/miniroot/install.sh | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index c24a1f753c9..2c8f85f03f9 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.15 1997/10/17 12:05:56 deraadt Exp $ +# $OpenBSD: install.sh,v 1.16 1997/10/17 12:21:02 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -358,22 +358,22 @@ __network_config_2 ;; esac +if [ "`df /`" = "`df /mnt`" ]; then + # Now that the network has been configured, it is safe to configure the + # fstab. + ( + while read _dev _mp; do + if [ "$_mp" = "/" ]; then + echo /dev/$_dev $_mp ffs rw 1 1 + else + echo /dev/$_dev $_mp ffs rw 1 2 + fi + done + ) < ${FILESYSTEMS} > /tmp/fstab + # XXX We no longer do the following. It is not neccessary. It can be done # XXX after the install is complete. # -#if [ "`df /`" = "`df /mnt`" ]; then -# # Now that the network has been configured, it is safe to configure the -# # fstab. -# ( -# while read _dev _mp; do -# if [ "$_mp" = "/" ]; then -# echo /dev/$_dev $_mp ffs rw 1 1 -# else -# echo /dev/$_dev $_mp ffs rw 1 2 -# fi -# done -# ) < ${FILESYSTEMS} > /tmp/fstab -# # echo "The fstab is configured as follows:" # echo "" # cat /tmp/fstab @@ -395,9 +395,10 @@ esac # esac # # echo "" -# munge_fstab /tmp/fstab /tmp/fstab.shadow -# mount_fs /tmp/fstab.shadow -#fi + + munge_fstab /tmp/fstab /tmp/fstab.shadow + mount_fs /tmp/fstab.shadow +fi mount | while read line; do set -- $line |