Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/distrib/atari/floppies/common Pull up following revision(...



details:   https://anonhg.NetBSD.org/src/rev/7bead0d753c6
branches:  netbsd-6
changeset: 774306:7bead0d753c6
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jul 05 17:33:59 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #394):
        distrib/atari/floppies/common/dot.profile: revision 1.4
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.

diffstat:

 distrib/atari/floppies/common/dot.profile |  17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diffs (32 lines):

diff -r c994e043f52e -r 7bead0d753c6 distrib/atari/floppies/common/dot.profile
--- a/distrib/atari/floppies/common/dot.profile Thu Jul 05 17:29:15 2012 +0000
+++ b/distrib/atari/floppies/common/dot.profile Thu Jul 05 17:33:59 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.3 2008/11/17 20:14:35 abs Exp $
+# $NetBSD: dot.profile,v 1.3.10.1 2012/07/05 17:33:59 riz Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -47,16 +47,13 @@
 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



Home | Main Index | Thread Index | Old Index