Module Name: src
Committed By: tsutsui
Date: Sat Jun 30 10:20:26 UTC 2012
Modified Files:
src/distrib/atari/floppies/common: dot.profile
Log Message:
Simply use "mount -u" to (re)mount root file system read-write
rather than denoting it using temporary /tmp/.root_writable file,
because it will never be removed if root file system is on floppy.
Fixes PR port-atari/37470.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/atari/floppies/common/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/atari/floppies/common/dot.profile
diff -u src/distrib/atari/floppies/common/dot.profile:1.3 src/distrib/atari/floppies/common/dot.profile:1.4
--- src/distrib/atari/floppies/common/dot.profile:1.3 Mon Nov 17 20:14:35 2008
+++ src/distrib/atari/floppies/common/dot.profile Sat Jun 30 10:20:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.3 2008/11/17 20:14:35 abs Exp $
+# $NetBSD: dot.profile,v 1.4 2012/06/30 10:20:26 tsutsui Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
# Copyright (c) 1994 Christopher G. Demetriou
@@ -47,16 +47,13 @@ export EDITOR
umask 022
makerootwritable() {
- if [ ! -e /tmp/.root_writable ]; then
- # note, only handles up to partition 'j'
- rootdev=/dev/$(sysctl -n kern.root_device)$(sysctl -n kern.root_partition | sed y/0123456789/abcdefghij/)
- if ! mount $rootdev / ; then
- echo "Unable to mount $rootdev read-write"
- exit 1
- fi
- cp /dev/null /tmp/.root_writable
- echo "Mounted $rootdev read-write"
+ # note, only handles up to partition 'j'
+ rootdev=/dev/$(sysctl -n kern.root_device)$(sysctl -n kern.root_partition | sed y/0123456789/abcdefghij/)
+ if ! mount -u $rootdev / ; then
+ echo "Unable to mount $rootdev read-write"
+ exit 1
fi
+ echo "Mounted $rootdev read-write"
}
if [ "X${DONEPROFILE}" = "X" ]; then
