[Pkg-sysvinit-commits] r427 - in sysvinit/trunk/debian: . initscripts

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-20 17:40:03 +0000 (Tue, 20 Dec 2005)
New Revision: 427

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
   sysvinit/trunk/debian/rules
Log:
Use /var/lib instead of /var/run for nologin flag file

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-20 17:30:11 UTC (rev 426)
+++ sysvinit/trunk/debian/changelog	2005-12-20 17:40:03 UTC (rev 427)
@@ -13,9 +13,10 @@
   * 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/run/nologin so that the flag file
-      is no longer created on the root filesystem (when DELAYLOGIN=yes).
-      To switch on "nologin" permanently, replace /etc/nologin with a file.
+    + 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.
   * 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/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2005-12-20 17:30:11 UTC (rev 426)
+++ sysvinit/trunk/debian/initscripts/postinst	2005-12-20 17:40:03 UTC (rev 427)
@@ -220,8 +220,8 @@
 #
 if [ ! -L /etc/nologin ] && [ ! -e /etc/nologin ]
 then
-	rm -f /var/lib/nologin
-	ln -s /var/lib/nologin /etc/nologin
+	rm -f /var/lib/initscripts/nologin
+	ln -s /var/lib/initscripts/nologin /etc/nologin
 fi
 
 #

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2005-12-20 17:30:11 UTC (rev 426)
+++ sysvinit/trunk/debian/rules	2005-12-20 17:40:03 UTC (rev 427)
@@ -45,8 +45,7 @@
 	#
 	-rm -rf $(tmp)
 	install -d -g root -m 755 -o root $(tmp)
-	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc,usr}
-	install -d -g root -m 755 -o root $(tmp)/usr/share
+	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc}
 	install -d -g root -m 755 -o root $(tmp)/usr/share/sysvinit
 	install -d -g root -m 755 -o root $(tmp)/usr/include
 	install -d -g root -m 755 -o root $(tmp)/var/log/fsck
@@ -103,14 +102,14 @@
 	#
 	-rm -rf $(tmp)
 	install -d -g root -m 755 -o root $(tmp)
-	#install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc,usr,sbin,lib,run}
-	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc,usr,sbin,lib}
+	#install -d -g root -m 755 -o root $(tmp)/{DEBIAN,sbin,run}
+	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,sbin}
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	install -d -g root -m 755 -o root $(tmp)/sys
 endif
 	install -d -g root -m 755 -o root $(tmp)/lib/init
-	install -d -g root -m 755 -o root $(tmp)/usr/share
 	install -d -g root -m 755 -o root $(tmp)/usr/share/initscripts
+	install -d -g root -m 755 -o root $(tmp)/var/lib/initscripts
 	install -d -g root -m 755 -o root $(tmp)$(doc)/initscripts
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
 		> $(tmp)$(doc)/initscripts/changelog.Debian
@@ -168,7 +167,7 @@
 	#
 	-rm -rf $(tmp)
 	install -d -g root -m 755 -o root $(tmp)
-	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc,usr}
+	install -d -g root -m 755 -o root $(tmp)/DEBIAN
 	install -d -g root -m 755 -o root $(tmp)/usr/share
 	install -d -g root -m 755 -o root $(tmp)$(doc)/sysv-rc
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
@@ -183,7 +182,6 @@
 	chmod -R go=u-w $(tmp)/etc
 	chown -R root.root $(tmp)/etc
 	install -d -g root -m 755 -o root $(tmp)/usr/sbin
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man
 	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man5
 	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man8
 	install -d -g root -m 755 -o root $(tmp)/usr/share/man/ja/man8