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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-20 18:11:21 +0000 (Tue, 20 Dec 2005)
New Revision: 433

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
   sysvinit/trunk/debian/initscripts/postinst
Log:
Improve nologin flag file handling

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-20 17:59:31 UTC (rev 432)
+++ sysvinit/trunk/debian/changelog	2005-12-20 18:11:21 UTC (rev 433)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-8~4) unstable; urgency=low
+sysvinit (2.86.ds1-8~5) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
   * Upload to unstable  (Closes: #341075)
@@ -13,10 +13,11 @@
   * initscripts.postinst:
     + Don't fail to install on file-rc systems  (Closes: #343993)
     + Don't fail to install in chroots  (Closes: #344089)
-    + Make /etc/nologin a symlink to /var/lib/initscripts/nologin so
-      that the flag file that is created when DELAYLOGIN=yes is no
-      longer created on the root filesystem.  To switch on "nologin"
-      permanently, replace /etc/nologin with a file.
+  * No longer keep the dynamic nologin flag file on the root filesystem;
+    instead, keep it at /var/lib/initscripts/nologin.  Note to admins:
+    initscripts's postinst symlinks /etc/nologin to the latter location;
+    to switch on "nologin" mode permanently, simply replace the symlink
+    with a file.
   * mountvirtfs: Mount /dev/shm earlier; move long comment to README.Debian
   * Add 45_pidof_symlink.dpatch: Make pidof an absolute symlink
     (Closes: #343862)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-12-20 17:59:31 UTC (rev 432)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-12-20 18:11:21 UTC (rev 433)
@@ -14,18 +14,14 @@
 
 do_start () {
 	#
-	# If /etc/nologin is a symbolic link and login delaying is enabled
-	# then create the flag file which prevents logins before startup
-	# is complete
+	# If login delaying is enabled then create the flag file
+	# which prevents logins before startup is complete
 	#
-	if [ -L /etc/nologin ]
-	then
-		case "$DELAYLOGIN" in
-		  Y*|y*)
-			echo "System bootup in progress - please wait" > /etc/nologin
-			;;
-		esac
-	fi
+	case "$DELAYLOGIN" in
+	  Y*|y*)
+		echo "System bootup in progress - please wait" > /var/lib/initscripts/nologin
+		;;
+	esac
 
 	# Create /var/run/utmp so we can login.
 	: > /var/run/utmp

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-12-20 17:59:31 UTC (rev 432)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-12-20 18:11:21 UTC (rev 433)
@@ -13,23 +13,19 @@
 #                    bootmisc earlier in the boot process.
 ### END INIT INFO
 
-PATH=/lib/init:/sbin:/bin
+PATH=/sbin:/bin
 [ "$DELAYLOGIN" ] || DELAYLOGIN=yes
 . /lib/init/vars.sh
 
 do_start () {
 	#
-	# If /etc/nologin is a symbolic link and login delaying is enabled
-	# then remove the flag file (at the target of the symlink)
+	# If login delaying is enabled then remove the flag file
 	#
-	if [ -L /etc/nologin ]
-	then
-		case "$DELAYLOGIN" in
-		  Y*|y*)
-			rm -f "$(readlink -f /etc/nologin || :)"
-			;;
-		esac
-	fi
+	case "$DELAYLOGIN" in
+	  Y*|y*)
+		rm -f /var/lib/initscripts/nologin
+		;;
+	esac
 }
 
 case "$1" in

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2005-12-20 17:59:31 UTC (rev 432)
+++ sysvinit/trunk/debian/initscripts/postinst	2005-12-20 18:11:21 UTC (rev 433)
@@ -217,6 +217,7 @@
 
 #
 # Set up nologin symlink so that dynamic-login-disabling will work
+# (if DELAYLOGIN is set to "yes")
 #
 if [ ! -L /etc/nologin ] && [ ! -e /etc/nologin ]
 then