[Pkg-sysvinit-commits] r591 - in sysvinit/trunk/debian: .
initscripts initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Wed Jan 11 16:32:57 UTC 2006
Author: jdthood-guest
Date: 2006-01-11 16:32:55 +0000 (Wed, 11 Jan 2006)
New Revision: 591
Added:
sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Removed:
sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs
sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/conffiles
sysvinit/trunk/debian/initscripts/postinst
Log:
Rename mountvirtfs to mountkernfs.sh; rename mountdevsubfs to mountdevsubfs.sh
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/changelog 2006-01-11 16:32:55 UTC (rev 591)
@@ -13,6 +13,9 @@
* Complete the split of mountdevsubfs out of mountvirtfs
* /etc/init.d/README: Note that /etc/init.d/*.sh must have '#!/bin/sh'
and must follow policy 10.4.
+ * mountvirtfs is now mountkernfs.sh
+ mountdevsubfs is now mountdevsubfs.sh
+ mountvirtfs now calls the above two, for backward compatibility
[ Ubuntu backports by T.H. ]
* During shutdown and reboot take the progress bar from 100 to 0
Modified: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/conffiles 2006-01-11 16:32:55 UTC (rev 591)
@@ -13,7 +13,8 @@
/etc/init.d/mountnfs.sh
/etc/init.d/mountnfs-bootclean.sh
/etc/init.d/mountvirtfs
-/etc/init.d/mountdevsubfs
+/etc/init.d/mountkernfs.sh
+/etc/init.d/mountdevsubfs.sh
/etc/init.d/reboot
/etc/init.d/rmnologin
/etc/init.d/sendsigs
Deleted: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs 2006-01-11 16:32:55 UTC (rev 591)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: mountdevsubfs
-# Required-Start: mountvirtfs
-# Required-Stop:
-# Default-Start: S
-# Default-Stop:
-# Short-Description: Mount special file systems under /dev.
-# Description: Mount the virtual filesystems the kernel provides
-# that ordinarily live under the /dev filesystem.
-### END INIT INFO
-
-# Script needs to be robust and continue when parts fail,
-# so we're NOT setting the "-e" option.
-
-PATH=/lib/init:/bin:/sbin
-TTYGRP=5
-TTYMODE=620
-[ -f /etc/default/devpts ] && . /etc/default/devpts
-
-TMPFS_SIZE=
-[ -f /etc/default/tmpfs ] && . /etc/default/tmpfs
-
-KERNEL="$(uname -s)"
-
-. /lib/lsb/init-functions
-. /lib/init/mount-functions.sh
-
-umask 022
-
-do_start () {
- #
- # Mount a tmpfs on /dev/shm
- #
- SHM_OPT=
- [ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT="-osize=$SHM_SIZE"
- domount tmpfs shmfs /dev/shm $SHM_OPT
-
- #
- # Mount /dev/pts. Create master ptmx node if needed.
- #
- # As of 2.5.68, devpts is not automounted when using devfs. So we
- # mount devpts if it is compiled in (older devfs didn't require it
- # to be compiled in at all).
- #
- if [ "$KERNEL" = Linux ]
- then
- #
- # Since kernel 2.5.something, devfs doesn't include
- # a standard /dev/pts directory anymore. So if devfs
- # is mounted on /dev we need to create that directory
- # manually.
- #
- if grep -qs '/dev devfs' /proc/mounts
- then
- if [ ! -d /dev/pts ]
- then
- mkdir /dev/pts
- fi
- fi
- if [ -d /dev/pts ]
- then
- if [ ! -c /dev/ptmx ]
- then
- mknod --mode=666 /dev/ptmx c 5 2
- ES=$?
- if [ "$ES" != 0 ]
- then
- log_warning_msg "Failed making node /dev/ptmx with error code ${ES}."
- fi
- fi
- domount devpts "" /dev/pts -ogid=$TTYGRP,mode=$TTYMODE
- fi
- fi
-}
-
-case "$1" in
- "")
- echo "Warning: mountdevsubfs should be called with the 'start' argument." >&2
- do_start
- ;;
- start)
- do_start
- ;;
- restart|reload|force-reload)
- echo "Error: argument '$1' not supported" >&2
- exit 3
- ;;
- stop)
- # No-op
- ;;
- *)
- echo "Usage: mountdevsubfs [start|stop]" >&2
- exit 3
- ;;
-esac
Copied: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh (from rev 590, sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs)
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh 2006-01-11 16:32:55 UTC (rev 591)
@@ -0,0 +1,96 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: mountdevsubfs mountvirtfs
+# Required-Start: mountkernfs
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Mount special file systems under /dev.
+# Description: Mount the virtual filesystems the kernel provides
+# that ordinarily live under the /dev filesystem.
+### END INIT INFO
+
+# Script needs to be robust and continue when parts fail,
+# so we're NOT setting the "-e" option.
+
+PATH=/lib/init:/bin:/sbin
+TTYGRP=5
+TTYMODE=620
+[ -f /etc/default/devpts ] && . /etc/default/devpts
+
+TMPFS_SIZE=
+[ -f /etc/default/tmpfs ] && . /etc/default/tmpfs
+
+KERNEL="$(uname -s)"
+
+. /lib/lsb/init-functions
+. /lib/init/mount-functions.sh
+
+umask 022
+
+do_start () {
+ #
+ # Mount a tmpfs on /dev/shm
+ #
+ SHM_OPT=
+ [ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT="-osize=$SHM_SIZE"
+ domount tmpfs shmfs /dev/shm $SHM_OPT
+
+ #
+ # Mount /dev/pts. Create master ptmx node if needed.
+ #
+ # As of 2.5.68, devpts is not automounted when using devfs. So we
+ # mount devpts if it is compiled in (older devfs didn't require it
+ # to be compiled in at all).
+ #
+ if [ "$KERNEL" = Linux ]
+ then
+ #
+ # Since kernel 2.5.something, devfs doesn't include
+ # a standard /dev/pts directory anymore. So if devfs
+ # is mounted on /dev we need to create that directory
+ # manually.
+ #
+ if grep -qs '/dev devfs' /proc/mounts
+ then
+ if [ ! -d /dev/pts ]
+ then
+ mkdir /dev/pts
+ fi
+ fi
+ if [ -d /dev/pts ]
+ then
+ if [ ! -c /dev/ptmx ]
+ then
+ mknod --mode=666 /dev/ptmx c 5 2
+ ES=$?
+ if [ "$ES" != 0 ]
+ then
+ log_warning_msg "Failed making node /dev/ptmx with error code ${ES}."
+ fi
+ fi
+ domount devpts "" /dev/pts -ogid=$TTYGRP,mode=$TTYMODE
+ fi
+ fi
+}
+
+case "$1" in
+ "")
+ echo "Warning: mountdevsubfs should be called with the 'start' argument." >&2
+ do_start
+ ;;
+ start)
+ do_start
+ ;;
+ restart|reload|force-reload)
+ echo "Error: argument '$1' not supported" >&2
+ exit 3
+ ;;
+ stop)
+ # No-op
+ ;;
+ *)
+ echo "Usage: mountdevsubfs [start|stop]" >&2
+ exit 3
+ ;;
+esac
Copied: sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh (from rev 590, sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs)
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh 2006-01-11 16:32:55 UTC (rev 591)
@@ -0,0 +1,74 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: mountkernfs
+# Required-Start:
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Mount kernel virtual file systems.
+# Description: Mount initial set of virtual filesystems the kernel
+# provides and that are required by everything.
+### END INIT INFO
+
+# Script needs to be robust and continue when parts fail,
+# so we're NOT setting the "-e" option.
+
+PATH=/lib/init:/bin:/sbin
+
+. /lib/lsb/init-functions
+. /lib/init/mount-functions.sh
+
+umask 022
+
+do_start () {
+
+ #
+ # Mount proc filesystem on /proc
+ #
+ domount proc "" /proc
+
+ #
+ # Mount sysfs on /sys
+ #
+ # Only mount sysfs if it is supported (kernel >= 2.6)
+ if grep -E -qs "sysfs\$" /proc/filesystems
+ then
+ domount sysfs "" /sys
+ fi
+
+ #
+ # Mount usbfs/usbdevfs if /proc/bus/usb is present.
+ #
+ # Usbfs/usbdevfs is used for USB related binaries/libraries.
+ # "usbfs" and "usbdevfs" are the exact same filesystem.
+ # "usbdevfs" was renamed to "usbfs" by linux usb developers,
+ # because people sometimes mistook it as a part of devfs. Usbfs
+ # will be superseded by other filesystems (e.g. sysfs), and when
+ # it becomes obsolete the mount action below should be removed.
+ #
+ if [ -d /proc/bus/usb ]
+ then
+ domount usbfs usbdevfs /proc/bus/usb
+ fi
+}
+
+case "$1" in
+ "")
+ echo "Warning: mountvirtfs should be called with the 'start' argument." >&2
+ do_start
+ ;;
+ start)
+ do_start
+ ;;
+ restart|reload|force-reload)
+ echo "Error: argument '$1' not supported" >&2
+ exit 3
+ ;;
+ stop)
+ # No-op
+ ;;
+ *)
+ echo "Usage: mountvirtfs [start|stop]" >&2
+ exit 3
+ ;;
+esac
Deleted: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-11 16:32:55 UTC (rev 591)
@@ -1,74 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: mountvirtfs
-# Required-Start:
-# Required-Stop:
-# Default-Start: S
-# Default-Stop:
-# Short-Description: Mount kernel virtual file systems.
-# Description: Mount initial set of virtual filesystems the kernel
-# provides and that are required by everything.
-### END INIT INFO
-
-# Script needs to be robust and continue when parts fail,
-# so we're NOT setting the "-e" option.
-
-PATH=/lib/init:/bin:/sbin
-
-. /lib/lsb/init-functions
-. /lib/init/mount-functions.sh
-
-umask 022
-
-do_start () {
-
- #
- # Mount proc filesystem on /proc
- #
- domount proc "" /proc
-
- #
- # Mount sysfs on /sys
- #
- # Only mount sysfs if it is supported (kernel >= 2.6)
- if grep -E -qs "sysfs\$" /proc/filesystems
- then
- domount sysfs "" /sys
- fi
-
- #
- # Mount usbfs/usbdevfs if /proc/bus/usb is present.
- #
- # Usbfs/usbdevfs is used for USB related binaries/libraries.
- # "usbfs" and "usbdevfs" are the exact same filesystem.
- # "usbdevfs" was renamed to "usbfs" by linux usb developers,
- # because people sometimes mistook it as a part of devfs. Usbfs
- # will be superseded by other filesystems (e.g. sysfs), and when
- # it becomes obsolete the mount action below should be removed.
- #
- if [ -d /proc/bus/usb ]
- then
- domount usbfs usbdevfs /proc/bus/usb
- fi
-}
-
-case "$1" in
- "")
- echo "Warning: mountvirtfs should be called with the 'start' argument." >&2
- do_start
- ;;
- start)
- do_start
- ;;
- restart|reload|force-reload)
- echo "Error: argument '$1' not supported" >&2
- exit 3
- ;;
- stop)
- # No-op
- ;;
- *)
- echo "Usage: mountvirtfs [start|stop]" >&2
- exit 3
- ;;
-esac
Added: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-11 16:32:55 UTC (rev 591)
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+case "$1" in
+ start|"")
+ . /etc/init.d/mountkernfs.sh
+ . /etc/init.d/mountdevsubfs.sh
+ ;;
+ restart|reload|force-reload)
+ echo "Error: argument '$1' not supported" >&2
+ exit 3
+ ;;
+ stop)
+ # No-op
+ ;;
+ *)
+ echo "Usage: mountvirtfs [start|stop]" >&2
+ exit 3
+ ;;
+esac
+
+:
Property changes on: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
___________________________________________________________________
Name: svn:executable
+ *
Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst 2006-01-11 16:04:33 UTC (rev 590)
+++ sysvinit/trunk/debian/initscripts/postinst 2006-01-11 16:32:55 UTC (rev 591)
@@ -77,22 +77,22 @@
fi
#
-# Defaults for 2.85-16 and up for mountvirtfs levels changed,
-# so remove the existing startup links if we upgraded from
-# an older version.
+# In 2.86.ds1-10 the "mountvirtfs" script was replaced by
+# mountkernfs.sh and mountdevsubfs.sh.
#
-case "$oldver" in
- 2.85-1[0-5])
- update-rc.d -f mountvirtfs remove >/dev/null 2>&1 ||:
- ;;
-esac
+update-rc.d -f mountvirtfs remove >/dev/null 2>&1 || :
+# Eliminate experimental crap
+rm -f /etc/init.d/mountdevsubfs # NEEDED ONLY UNTIL NEXT UNSTABLE UPLOAD
+update-rc.d -f mountdevsubfs remove >/dev/null 2>&1 || : # NEEDED ONLY UNTIL NEXT UNSTABLE UPLOAD
+
#
# In 2.86.ds1-7 the "single" script was moved
+# We have to remove the old links before we install new ones.
#
if dpkg --compare-versions "$oldver" lt "2.86.ds1-7"
then
- update-rc.d -f single remove >/dev/null 2>&1 ||:
+ update-rc.d -f single remove >/dev/null 2>&1 || :
fi
#
@@ -102,8 +102,8 @@
#
# Links in runlevel S
#
-updatercd mountvirtfs start 2 S . start 36 S .
-updatercd mountdevsubfs start 4 S . start 37 S .
+updatercd mountkernfs.sh start 2 S . start 36 S .
+updatercd mountdevsubfs.sh start 4 S . start 37 S .
updatercd bootlogd start 5 S .
updatercd checkroot.sh start 10 S .
updatercd modutils start 20 S .
More information about the Pkg-sysvinit-commits
mailing list