Module Name: src
Committed By: abs
Date: Sun Sep 20 22:44:06 UTC 2009
Modified Files:
src/distrib/alpha/instkernel/ramdisk: install.sh
src/distrib/bebox/floppies/ramdisk: install.tmpl
src/distrib/miniroot: install.sh
Log Message:
remove references to disktab.{preinstall,shadow}
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/alpha/instkernel/ramdisk/install.sh
cvs rdiff -u -r1.7 -r1.8 src/distrib/bebox/floppies/ramdisk/install.tmpl
cvs rdiff -u -r1.24 -r1.25 src/distrib/miniroot/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/instkernel/ramdisk/install.sh
diff -u src/distrib/alpha/instkernel/ramdisk/install.sh:1.5 src/distrib/alpha/instkernel/ramdisk/install.sh:1.6
--- src/distrib/alpha/instkernel/ramdisk/install.sh:1.5 Wed Sep 16 10:40:02 2009
+++ src/distrib/alpha/instkernel/ramdisk/install.sh Sun Sep 20 22:44:06 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.5 2009/09/16 10:40:02 abs Exp $
+# $NetBSD: install.sh,v 1.6 2009/09/20 22:44:06 abs Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -303,7 +303,7 @@
fragsize=1024
blocksize=8192
-cat /etc/disktab.preinstall > $DT
+echo "# $DT" > $DT
echo "" >> $DT
echo "$labelname|NetBSD installation generated:\\" >> $DT
echo " :dt=${type}:ty=winchester:\\" >> $DT
Index: src/distrib/bebox/floppies/ramdisk/install.tmpl
diff -u src/distrib/bebox/floppies/ramdisk/install.tmpl:1.7 src/distrib/bebox/floppies/ramdisk/install.tmpl:1.8
--- src/distrib/bebox/floppies/ramdisk/install.tmpl:1.7 Fri Apr 23 02:48:12 2004
+++ src/distrib/bebox/floppies/ramdisk/install.tmpl Sun Sep 20 22:44:06 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.tmpl,v 1.7 2004/04/23 02:48:12 simonb Exp $
+# $NetBSD: install.tmpl,v 1.8 2009/09/20 22:44:06 abs Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -306,7 +306,7 @@
fragsize=1024
blocksize=8192
-cat /etc/disktab.preinstall > $DT
+echo "# $DT" > $DT
echo "" >> $DT
echo "$labelname|NetBSD installation generated:\\" >> $DT
echo " :dt=${type}:ty=winchester:\\" >> $DT
Index: src/distrib/miniroot/install.sh
diff -u src/distrib/miniroot/install.sh:1.24 src/distrib/miniroot/install.sh:1.25
--- src/distrib/miniroot/install.sh:1.24 Wed Apr 30 13:10:48 2008
+++ src/distrib/miniroot/install.sh Sun Sep 20 22:44:06 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.24 2008/04/30 13:10:48 martin Exp $
+# $NetBSD: install.sh,v 1.25 2009/09/20 22:44:06 abs Exp $
#
# Copyright (c) 1996,1997,1999,2000,2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -108,9 +108,9 @@
# just re-mount the root with read-write enabled.
md_makerootwritable
-# Install the shadowed disktab file; lets us write to it for temporary
+# Create a disktab file; lets us write to it for temporary
# purposes without mounting the miniroot read-write.
-cp /etc/disktab.shadow /tmp/disktab.shadow
+echo "# disktab" > /tmp/disktab.shadow
test "$md_view_labels_possible" && md_view_labels
