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

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-19 11:40:50 +0000 (Sat, 19 Nov 2005)
New Revision: 156

Added:
   sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/rules
Log:
  * Created new file /lib/init/functions.sh for functions common to
    scripts in initscripts.  Moved dir_writable() into it.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-19 11:28:10 UTC (rev 155)
+++ sysvinit/trunk/debian/changelog	2005-11-19 11:40:50 UTC (rev 156)
@@ -19,6 +19,8 @@
     when enabling swap.  Because of this, show error messages from
     swapon.
   * Add link to alioth project page in the Debian README.
+  * Created new file /lib/init/functions.sh for functions common to
+    scripts in initscripts.  Moved dir_writable() into it.
 
   [ Thomas Hood ]
   * Improve update-rc.d man page text.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-19 11:28:10 UTC (rev 155)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-19 11:40:50 UTC (rev 156)
@@ -16,6 +16,7 @@
 [ -z "$FSCKFIX" ] && FSCKFIX=no
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 . /lib/lsb/init-functions
+. /lib/init/functions.sh
 
 do_start () {
     # See if we're on AC Power

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-19 11:28:10 UTC (rev 155)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-19 11:40:50 UTC (rev 156)
@@ -20,18 +20,8 @@
 PATH=/lib/init:/bin:/sbin
 
 . /lib/lsb/init-functions
+. /lib/init/functions.sh
 
-#
-#	Helper: is a directory writable ?
-#
-dir_writable () {
-	if [ -d "$1/" ] && [ -w "$1/" ] && touch -a "$1/" 2>/dev/null
-	then
-		return 0
-	fi
-	return 1
-}
-
 do_start () {
 	#
 	#	Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to

Added: sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh	2005-11-19 11:28:10 UTC (rev 155)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh	2005-11-19 11:40:50 UTC (rev 156)
@@ -0,0 +1,16 @@
+#
+# Functions used by several scripts in initscripts package.  The API
+# provided here is not stable, and should only be used by the scripts
+# in the initscripts package.
+#
+
+#
+#	Helper: is a directory writable ?
+#
+dir_writable () {
+	if [ -d "$1/" ] && [ -w "$1/" ] && touch -a "$1/" 2>/dev/null
+	then
+		return 0
+	fi
+	return 1
+}

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-19 11:28:10 UTC (rev 155)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-19 11:40:50 UTC (rev 156)
@@ -27,6 +27,8 @@
 
 PATH=/lib/init:/bin:/sbin
 
+. /lib/init/functions.sh
+
 TTYGRP=5
 TTYMODE=620
 if [ -f /etc/default/devpts ]
@@ -43,14 +45,6 @@
 KERNEL=`uname -s`
 umask 022
 
-dir_writable () {
-	if [ -d "$1/" ] && [ -w "$1/" ] && touch -a "$1/" 2>/dev/null
-	then
-		return 0
-	fi
-	return 1
-}
-
 domount () {
 
 	# Directory present ?

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2005-11-19 11:28:10 UTC (rev 155)
+++ sysvinit/trunk/debian/rules	2005-11-19 11:40:50 UTC (rev 156)
@@ -115,7 +115,8 @@
 	cp -af debian/initscripts/etc/* $(tmp)/etc
 	ln -sf bootlogd $(tmp)/etc/init.d/stop-bootlogd
 	chmod 755 $(tmp)/etc/init.d/[a-z]*
-	chmod 644 $(tmp)/etc/init.d/bootclean.sh
+	chmod 644 $(tmp)/etc/init.d/bootclean.sh $(tmp)/etc/init.d/functions.sh
+	mv $(tmp)/etc/init.d/functions.sh $(tmp)/lib/init/functions.sh 
 	chmod -R g-w $(tmp)
 	chown -R root.root $(tmp)
 	install -d -g root -m 755 -o root $(tmp)/bin