[Pkg-sysvinit-commits] r438 - in sysvinit/trunk/debian: . initscripts initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-21 20:00:53 +0000 (Wed, 21 Dec 2005)
New Revision: 438

Added:
   sysvinit/trunk/debian/initscripts/run_README
Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/rules
Log:
Add more run stuff (without enabling it)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-21 18:26:16 UTC (rev 437)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-21 20:00:53 UTC (rev 438)
@@ -135,15 +135,20 @@
 }
 
 do_start () {
-if false
-then
 	#
-	# Mount /run
+	# Mount a tmpfs on /run
 	#
 	RUN_OPT=
 	[ "${RUN_SIZE:=$TMPFS_SIZE}" ] && RUN_OPT="-osize=$RUN_SIZE"
-	domount tmpfs "" /run -omode=755 $RUN_OPT && [ -d /etc/run.d ] && ! is_empty_dir /etc/run.d && is_empty_dir /run && cp -a --target-directory=/run /etc/run.d/*
-fi
+	if false && domount tmpfs "" /run -omode=755 $RUN_OPT
+	then
+		if is_empty_dir /run
+		then
+			[ -d /etc/run.d ] && ! is_empty_dir /etc/run.d && cp -a --target-directory=/run /etc/run.d/*
+		else
+			log_warning_msg "Files found in /run"
+		fi
+	fi
 
 	#
 	# Initialize mtab
@@ -174,12 +179,12 @@
 	fi
 
 	#
-	# Mount /proc
+	# Mount proc filesystem on /proc
 	#
 	domount proc "" /proc
 
 	#
-	# Mount /sys
+	# Mount sysfs on /sys
 	#
 	# Only mount sysfs if it is supported (kernel >= 2.6)
 	if grep -E -qs "sysfs\$" /proc/filesystems
@@ -188,7 +193,7 @@
 	fi
 
 	#
-	# Mount /dev/shm
+	# Mount a tmpfs on /dev/shm
 	#
 	SHM_OPT=
 	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT="-osize=$SHM_SIZE"

Added: sysvinit/trunk/debian/initscripts/run_README
===================================================================
--- sysvinit/trunk/debian/initscripts/run_README	2005-12-21 18:26:16 UTC (rev 437)
+++ sysvinit/trunk/debian/initscripts/run_README	2005-12-21 20:00:53 UTC (rev 438)
@@ -0,0 +1,3 @@
+This directory is for the use of Debian infrastructural programs only.
+It is a Filesystem Hierarchy Standard violation, and thus a Debian Policy
+violation, for other programs to use this directory.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2005-12-21 18:26:16 UTC (rev 437)
+++ sysvinit/trunk/debian/rules	2005-12-21 20:00:53 UTC (rev 438)
@@ -101,8 +101,10 @@
 	#
 	-rm -rf $(tmp)
 	install -d -g root -m 755 -o root $(tmp)
-	#install -d -g root -m 755 -o root $(tmp)/{DEBIAN,sbin,lib,etc,run}
 	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,sbin,lib,etc}
+	#RUN#install -d -g root -m 755 -o root $(tmp)/run
+	#RUN#install -d -g root -m 755 -o root $(tmp)/etc/run.d
+	#RUN#install -g root -m 644 debian/initscripts/run_README $(tmp)/etc/run.d/README
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	install -d -g root -m 755 -o root $(tmp)/sys
 endif