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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-22 11:08:27 +0000 (Thu, 22 Dec 2005)
New Revision: 439

Removed:
   sysvinit/trunk/debian/initscripts/run_README
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/rules
Log:
Remove /run code

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-21 20:00:53 UTC (rev 438)
+++ sysvinit/trunk/debian/changelog	2005-12-22 11:08:27 UTC (rev 439)
@@ -4,8 +4,7 @@
   * Upload to unstable  (Closes: #341075)
 
   [ Thomas Hood ]
-  * Remove /run
-    (Closes: #344001)
+  * Remove /run  (Closes: #344001)
   * Previous release also closed: #338736, #342160, #342744
   * Use /proc/mounts instead of /etc/mtab when unmounting  (Closes: #338801)
   * Override lintian warnings re: top-level dirs

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-21 20:00:53 UTC (rev 438)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-22 11:08:27 UTC (rev 439)
@@ -136,21 +136,6 @@
 
 do_start () {
 	#
-	# Mount a tmpfs on /run
-	#
-	RUN_OPT=
-	[ "${RUN_SIZE:=$TMPFS_SIZE}" ] && RUN_OPT="-osize=$RUN_SIZE"
-	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
 	#
 	DO_MTAB=

Deleted: sysvinit/trunk/debian/initscripts/run_README
===================================================================
--- sysvinit/trunk/debian/initscripts/run_README	2005-12-21 20:00:53 UTC (rev 438)
+++ sysvinit/trunk/debian/initscripts/run_README	2005-12-22 11:08:27 UTC (rev 439)
@@ -1,3 +0,0 @@
-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 20:00:53 UTC (rev 438)
+++ sysvinit/trunk/debian/rules	2005-12-22 11:08:27 UTC (rev 439)
@@ -102,9 +102,6 @@
 	-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)/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