[Pkg-sysvinit-commits] r947 - in sysvinit/trunk/debian: .
initscripts initscripts/etc/init.d initscripts/lib/init
initscripts/share
Petter Reinholdtsen
pere at costa.debian.org
Wed Sep 20 11:36:03 UTC 2006
Author: pere
Date: 2006-09-20 11:36:02 +0000 (Wed, 20 Sep 2006)
New Revision: 947
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/init.d/bootclean
sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
sysvinit/trunk/debian/initscripts/postinst
sysvinit/trunk/debian/initscripts/rcS.5
sysvinit/trunk/debian/initscripts/share/default.rcS
Log:
Rename TMPRUN and TMPLOCK to RAMRUN and RAMLOCK, to make the effect more obvious.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/changelog 2006-09-20 11:36:02 UTC (rev 947)
@@ -1,7 +1,7 @@
sysvinit (2.86.ds1-23~1) experimental; urgency=low
* Make the tmpfs on /var/run/ and /var/lock/ optional, and provide
- TMPRUN and TMPLOCK options in /etc/default/rcS to control this.
+ RAMRUN and RAMLOCK options in /etc/default/rcS to control this.
Remove code to convert to this feature when the package is
upgraded or installed. It will take effect after a reboot if
/etc/default/rcS is modified. Keep them disabled for now.
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean 2006-09-20 11:36:02 UTC (rev 947)
@@ -117,7 +117,7 @@
}
clean_lock() {
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK" ] ; then
return 0
fi
@@ -142,7 +142,7 @@
}
clean_run() {
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
return 0
fi
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh 2006-09-20 11:36:02 UTC (rev 947)
@@ -33,10 +33,10 @@
fi
# Mount /var/run and /var/lock as tmpfs if enabled
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
domount tmpfs "" /var/run varrun -omode=0755,nosuid
fi
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK ] ; then
domount tmpfs "" /var/lock varlock -omode=1777,nodev,noexec,nosuid
fi
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh 2006-09-20 11:36:02 UTC (rev 947)
@@ -114,10 +114,10 @@
then
domtab sysfs /sys "sys" -onodev,noexec,nosuid
fi
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
domtab tmpfs /var/run "varrun" -omode=0755,nodev,noexec,nosuid
fi
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK" ] ; then
domtab tmpfs /var/lock "varlock" -omode=1777,nodev,noexec,nosuid
fi
domtab tmpfs /lib/init/rw tmpfs -omode=0755,nosuid
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs 2006-09-20 11:36:02 UTC (rev 947)
@@ -70,12 +70,12 @@
continue
;;
/var/run)
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
continue
fi
;;
/var/lock)
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK" ] ; then
continue
fi
;;
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh 2006-09-20 11:36:02 UTC (rev 947)
@@ -52,12 +52,12 @@
continue
;;
/var/run)
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
continue
fi
;;
/var/lock)
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK ] ; then
continue
fi
;;
Modified: sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh 2006-09-20 11:36:02 UTC (rev 947)
@@ -122,11 +122,11 @@
# or because /var is a symlink to something that's mounted. So keep
# copies of the /var/run and /var/lock mounts elsewhere on the root
# filesystem so they can be moved back.
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
mkdir /lib/init/rw/var.run
mount -n --bind /var/run /lib/init/rw/var.run
fi
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK" ] ; then
mkdir /lib/init/rw/var.lock
mount -n --bind /var/lock /lib/init/rw/var.lock
fi
@@ -140,12 +140,12 @@
# Move the mountpoints back. Fortunately mount seems to not care
# if these are the same thing (ie. /var didn't get changed) so we
# do this regardless
- if [ yes = "$TMPRUN" ] ; then
+ if [ yes = "$RAMRUN" ] ; then
[ -d /var/run ] || mkdir /var/run
mount -n --move /lib/init/rw/var.run /var/run
rmdir /lib/init/rw/var.run
fi
- if [ yes = "$TMPLOCK" ] ; then
+ if [ yes = "$RAMLOCK" ] ; then
[ -d /var/lock ] || mkdir /var/lock
mount -n --move /lib/init/rw/var.lock /var/lock
rmdir /lib/init/rw/var.lock
Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/postinst 2006-09-20 11:36:02 UTC (rev 947)
@@ -155,7 +155,7 @@
#
# Create /var/run and /var/lock on the root partition to make sure
-# they are available if TMPRUN or TMPLOCK is enabled.
+# they are available if RAMRUN or RAMLOCK is enabled.
#
if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-22"
then
Modified: sysvinit/trunk/debian/initscripts/rcS.5
===================================================================
--- sysvinit/trunk/debian/initscripts/rcS.5 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/rcS.5 2006-09-20 11:36:02 UTC (rev 947)
@@ -97,10 +97,10 @@
This will tell fsck always to repair the file systems
without asking for permission.
-.IP \fBTMPRUN\fP
+.IP \fBRAMRUN\fP
Mount /var/run/ as tmpfs. Set to 'yes' to enable, to 'no' to disable.
-.IP \fBTMPLOCK\fP
+.IP \fBRAMLOCK\fP
Mount /var/lock/ as tmpfs. Set to 'yes' to enable, to 'no' to disable.
.SH NOTE
Modified: sysvinit/trunk/debian/initscripts/share/default.rcS
===================================================================
--- sysvinit/trunk/debian/initscripts/share/default.rcS 2006-09-20 11:29:55 UTC (rev 946)
+++ sysvinit/trunk/debian/initscripts/share/default.rcS 2006-09-20 11:36:02 UTC (rev 947)
@@ -13,5 +13,5 @@
UTC=yes
VERBOSE=no
FSCKFIX=no
-TMPRUN=no
-TMPLOCK=no
+RAMRUN=no
+RAMLOCK=no
More information about the Pkg-sysvinit-commits
mailing list