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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-12 09:57:22 +0000 (Thu, 12 Jan 2006)
New Revision: 619

Modified:
   sysvinit/trunk/debian/NOTES
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
Log:
Edit NOTES; add NOTE with list of things to do after etch; add comment about portmap to mountnfs.sh

Modified: sysvinit/trunk/debian/NOTES
===================================================================
--- sysvinit/trunk/debian/NOTES	2006-01-12 00:37:46 UTC (rev 618)
+++ sysvinit/trunk/debian/NOTES	2006-01-12 09:57:22 UTC (rev 619)
@@ -1,6 +1,6 @@
                  Maintainer notes for sysvinit
 
-sourcing .sh scripts
+Sourcing .sh scripts
 --------------------
 If .sh scripts are sourced then we need to conflict with versions of
 packages containing initscripts that exit:
@@ -20,31 +20,30 @@
     S50hwclock.sh         util-linux       #343447
     S30procps.sh          procps           #343620
 
-Ubuntu diff
------------
-In 2.86.ds1-6ubuntu1 Ubuntu split a new initscript, mtab, out of mountvirtfs.
-We could do the same.  Currently we execute mountvirtfs and mountdevsubfs
-again at S36 and S37 so that they can update mtab.
+Stuff to do after etch
+----------------------
+* mountnfs.sh: Don't start portmap
+* bootclean: Use "-delete" and "-exec ... {} +" features of find for deleting
 
-patches for upstream
---------------------
+Ubuntu changes to backport
+--------------------------
+
+Stuff to send upstream
+----------------------
+startpar patches
 debian/patches/fix-minor-warnings should be applied upstream.
 So should a lot of the other patches.
 
 src/Makefile should not set CC.
 
-startpar
--------
-Patches to this should be sent upstream
-
-bash
-----
+Don't use bash
+--------------
 umountfs should not specify #!/bin/bash, because bash loads
 /usr/lib/libldap.so when ldap authentication is enabled; umount /usr/
 would fail.  (Bug #159771)
 
-fsck log
---------
+Rotating fsck log
+-----------------
 debian/fscklog.sh is a proposed script for rotating the fsck log.
 Currently, we overwrite the log files on every boot so there is
 no need to rotate them.
@@ -81,7 +80,7 @@
 sysv-rc needs to Replace: file-rc.  Isn't Conflicting sufficient?
 And why doesn't file-rc Conflict with sysv-rc?  Strange.
 
-speed and compatibility
+Speed and compatibility
 -----------------------
 People running Debian on low-memory systems say:
 * Use built-ins
@@ -92,8 +91,8 @@
   'nice', 'find', 'mount', 'umount', 'init', 'halt', 'shutdown', 
   'syslogd', 'klogd', 'hwclock', 'cron', 'anacron', 'crontab'.
 
-regenerating /etc/default/rcS
------------------------------
+Regenerate /etc/default/rcS?
+----------------------------
 The current /etc/default/rcS template just refers the admin to rcS(5).
 This way we have only one set of docs to maintain, and we don't have
 to worry about out-of-date comments in /etc/default/rcS.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2006-01-12 00:37:46 UTC (rev 618)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2006-01-12 09:57:22 UTC (rev 619)
@@ -73,6 +73,11 @@
 
 	exec 0<&9 9<&-
 
+	#
+	# With contemporary portmap packages it is no longer necessary
+	# to start portmap here because the package has its own initscript.
+	# This code will disappear after etch.
+	#
 	if [ "$portmap" = yes ]
 	then
 		if [ -x /sbin/portmap ] && [ -z "$(pidof portmap)" ] 
@@ -89,6 +94,7 @@
 			fi
 		fi
 	fi
+
 	if [ "$NETFS" ]
 	then
 		do_mount() { mount -a -t$NETFS ; }