summaryrefslogtreecommitdiff
path: root/distrib/sparc64/ramdiskB
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2002-03-03 00:43:38 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2002-03-03 00:43:38 +0000
commit52fea3aae5e7d849b3126f3dfc4c70e59b9629f5 (patch)
tree39bc4c08b639b8aab6ca7d1dcdacfcd2a0ac9d48 /distrib/sparc64/ramdiskB
parentb74f14a248dcd82476ee017f07051f9b2b871a77 (diff)
Cleanup/Improve trap handling.
a) Add /var/run to the filesystem created when the installation media boots. This allows the creation and use of the dhclient.pid file. Synchronize all mtree.conf files in architectures using miniroot. b) Rework the traps used in upgrade.sh and install.sh so that HUP, INT, QUIT, TERM and EXIT all invoke a cleanup function that kills an active dhclient, unmounts all filesystems and fsck's -p all devices in /etc/fstab, or just /mnt if /etc/fstab is not present. c) Make sure the actions of the cleanup function are visible, thus eliminating the long delay with no feedback at the end of the upgrade/install script, after the congratulatory message. d) Reduce manual parsing of fstab files by using umount -a to unmount all mounted filesystems. e) Since the new cleanup function tries to unmount all filesystems, use the presence of /etc/fstab, rather than a difference between `df /` and `df /mnt`, to determine if an install is being restarted in a state where disk initialization can be skipped. f) Change munge_fs, check_fs, mount_fs, remount_fs so that they all 'know' about /etc/fstab rather than passing the same parameter in all the time. g) Use input redirection on munge_fs to read correct file, rather than passing a file name as a parameter. h) Indent code for various smaller functions. i) Eliminate some subshell usage to simplify code further. j) Display pretty messages during fsck -p to clearly indicate success or failure of fsck, rather than just dumping fsck output. k) Always run mount_fs in install.sh, even if disk initialization is being skipped, because the trap should have unmounted all filesystems when the last run terminated. ok weingart@ millert@
Diffstat (limited to 'distrib/sparc64/ramdiskB')
-rw-r--r--distrib/sparc64/ramdiskB/mtree.conf16
1 files changed, 14 insertions, 2 deletions
diff --git a/distrib/sparc64/ramdiskB/mtree.conf b/distrib/sparc64/ramdiskB/mtree.conf
index c619ef1e898..82608136920 100644
--- a/distrib/sparc64/ramdiskB/mtree.conf
+++ b/distrib/sparc64/ramdiskB/mtree.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: mtree.conf,v 1.1 2001/10/10 04:21:02 deraadt Exp $
+# $OpenBSD: mtree.conf,v 1.2 2002/03/03 00:43:37 krw Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -17,6 +17,11 @@ dev
# ./etc
etc
+# ./etc/ppp
+ppp
+# ./etc/ppp
+..
+
# ./etc
..
@@ -76,15 +81,22 @@ misc
var
# ./var/tmp
-tmp mode=0177
+tmp mode=01777
# ./var/tmp
..
# ./var/db
db
+
# ./var/db
..
+# ./var/run
+run
+
+# ./var/run
+..
+
# ./var
..