From afdcf1fa158e9833c163068f77e88d21ba0e3225 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 14 Dec 2007 20:09:53 +0000
Subject: [PATCH] udev requires try function and the modules-update program
 should take care of any 2.4 vs 2.6 kernel issues. Also add vim instructions
 to a few files.

---
 default.mk               |  3 +++
 init.d.Linux/consolefont |  4 ++--
 init.d.Linux/keymaps     |  2 +-
 init.d.Linux/modules     | 26 +++-----------------------
 init.d.Linux/procfs      | 10 ++++++----
 init.d.Linux/sysctl      |  2 ++
 init.d.misc/dbus         |  2 ++
 init.d.misc/dnsmasq      |  2 ++
 init.d.misc/hald         |  2 ++
 init.d.misc/named        |  2 ++
 init.d.misc/ntpd         |  2 ++
 init.d.misc/openvpn      |  2 ++
 init.d.misc/polkitd      |  2 ++
 init.d.misc/sshd         |  2 ++
 init.d/checkroot         |  2 +-
 net.BSD/iwconfig.sh      |  2 +-
 runlevels.mk             |  2 ++
 sh.Linux/init.sh         | 11 ++++++-----
 src/rc-update.c          | 14 +++++++-------
 19 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/default.mk b/default.mk
index c2f44aa1..cdde3433 100644
--- a/default.mk
+++ b/default.mk
@@ -56,3 +56,6 @@ install:: $(BIN) $(CONF) $(CONF_APPEND)
 	   		$(INSTALL) -m 0644 $$x $(DESTDIR)$(DIR) || exit $$?; \
 		fi; \
 	done
+
+# vim: set ts=4 :
+
diff --git a/init.d.Linux/consolefont b/init.d.Linux/consolefont
index c1a4755a..824a848e 100755
--- a/init.d.Linux/consolefont
+++ b/init.d.Linux/consolefont
@@ -56,7 +56,7 @@ start() {
 		return 0
 	fi
 
-	local x= param= sf_param= retval=1 ttydev=
+	local x= param= sf_param= retval=0 ttydev=
 
 	# Get additional parameters
 	if [ -n "${consoletranslation}" ]; then
@@ -74,7 +74,7 @@ start() {
 
 	x=1
 	while [ ${x} -le ${ttyn} ]; do
-		setfont ${consolefont} ${param}-C ${ttydev}${x} >/dev/null 
+		setfont ${consolefont} ${param} -C ${ttydev}${x} >/dev/null 
 		retval=$((${retval} + $?))
 		x=$((${x} + 1))
 	done
diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps
index 014024b5..4af63838 100755
--- a/init.d.Linux/keymaps
+++ b/init.d.Linux/keymaps
@@ -103,4 +103,4 @@ start() {
 	eend 0
 }
 
-# vim:ts=4
+# vim: set ts=4 :
diff --git a/init.d.Linux/modules b/init.d.Linux/modules
index 4c21fdb5..75fa8f6b 100755
--- a/init.d.Linux/modules
+++ b/init.d.Linux/modules
@@ -1,5 +1,4 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
 # Copyright 2007 Roy Marples
 # All rights reserved
 
@@ -35,7 +34,7 @@ load_modules() {
 	local modules=""
 	local config="$1"
 
-	[ -z "${config}" -o ! -r "${config}" ] && return 0
+	[ -r "${config}" ] || return 0
 
 	eval set -- $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' \
 	-e "s/'/'\\\\''/g" -e "s/^/'/g" -e "s/$/'/g" "${config}")
@@ -69,23 +68,7 @@ start() {
 	x=${KV#*.*.}
 	local KV_MICRO=${x%%-*}
 
-	# Make sure depmod from modutils do not whine, but do not bother if
-	# we are on a 2.6 kernel without modprobe.old
-	if [ -z "${CDBOOT}"  -a ! -e /etc/modules.conf ] && \
-	   [ $(KV_to_int "${KV}") -lt $(KV_to_int '2.5.48') -o -x /sbin/modprobe.old ]
-	then
-		echo '### This file is automatically generated by update-modules' \
-			> /etc/modules.conf 2>/dev/null
-		[ ! -f /etc/modules.conf ] && \
-			ewarn "Cannot update /etc/modules.conf!"
-	fi
-	
-	# Only do this if we have modules.conf or a 2.6 kernel
-	if [ -z "${CDBOOT}" ] && \
-	   [ -f /etc/modules.conf -o $(KV_to_int "${KV}") -ge $(KV_to_int '2.5.48') ]
-	then
-		/sbin/update-modules 
-	fi
+	[ -z "${CDBOOT}" ] && update-modules
 
 	local auto=""
 	if [ -f /etc/modules.autoload -a ! -L /etc/modules.autoload ]; then
@@ -109,15 +92,12 @@ start() {
 	fi
 	[ -n "${auto}" ] && load_modules "${auto}"
 
-	#
 	# Just in case a sysadmin prefers generic symbolic links in
 	# /lib/modules/boot for boot time modules we will load these modules
-	#
 	[ -n "$(modprobe -l -t boot)" ] && modprobe -a -t boot \* 2>/dev/null
 	
 	# Above test clobbers the return
 	return 0
 }
 
-
-# vim:ts=4
+# vim: set ts=4 :
diff --git a/init.d.Linux/procfs b/init.d.Linux/procfs
index 85de863b..06a4e78a 100644
--- a/init.d.Linux/procfs
+++ b/init.d.Linux/procfs
@@ -78,8 +78,8 @@ start() {
 	if [ -d /sys/kernel/security ] && ! mountinfo -q /sys/kernel/security; then
 		if grep -qs securityfs /proc/filesystems; then
 			ebegin "Mounting security filesystem"
-			mount -t securityfs securityfs /sys/kernel/security \
-				-o nodev,noexec,nosuid
+			mount -t securityfs -o nodev,noexec,nosuid \
+				securityfs /sys/kernel/security
 			eend $?
 		fi
 	fi
@@ -88,8 +88,8 @@ start() {
 	if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug; then
 		if grep -qs debugfs /proc/filesystems; then
 			ebegin "Mounting debug filesystem"
-			mount -t debugfs debugfs /sys/kernel/debug \
-				-o nodev,noexec,nosuid
+			mount -t debugfs -o nodev,noexec,nosuid \
+				debugfs /sys/kernel/debug
 			eend $?
 		fi
 	fi
@@ -105,3 +105,5 @@ start() {
 
 	return 0
 }
+
+# vim: set ts=4 :
diff --git a/init.d.Linux/sysctl b/init.d.Linux/sysctl
index 2cac1019..b1971cab 100644
--- a/init.d.Linux/sysctl
+++ b/init.d.Linux/sysctl
@@ -35,3 +35,5 @@ start() {
 	sysctl -p /etc/sysctl.conf >/dev/null
 	eend $?
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/dbus b/init.d.misc/dbus
index 3ac4ed40..be707f89 100644
--- a/init.d.misc/dbus
+++ b/init.d.misc/dbus
@@ -36,3 +36,5 @@ depend() {
 start_pre() {
     mkdir -p $(dirname $pidfile)
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/dnsmasq b/init.d.misc/dnsmasq
index 05e75d59..960c5fae 100644
--- a/init.d.misc/dnsmasq
+++ b/init.d.misc/dnsmasq
@@ -41,3 +41,5 @@ reload() {
 	start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
 	eend $?
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/hald b/init.d.misc/hald
index 09a63804..e6a9b2d2 100644
--- a/init.d.misc/hald
+++ b/init.d.misc/hald
@@ -31,3 +31,5 @@ name="Hardware Abstraction Layer Daemon"
 depend() {
 	need dbus
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/named b/init.d.misc/named
index 901502a7..1b8f1906 100644
--- a/init.d.misc/named
+++ b/init.d.misc/named
@@ -114,3 +114,5 @@ stop_post() {
 		umount "${named_chroot}"/dev 2>/dev/null || true
 	fi
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/ntpd b/init.d.misc/ntpd
index 28ca5b1a..de1ccb38 100644
--- a/init.d.misc/ntpd
+++ b/init.d.misc/ntpd
@@ -57,3 +57,5 @@ start_pre() {
 		command_args="${command_args} -u ntpd:ntpd -i ${ntpd_chroot}"
 	fi
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/openvpn b/init.d.misc/openvpn
index bdc9558f..591464c7 100755
--- a/init.d.misc/openvpn
+++ b/init.d.misc/openvpn
@@ -89,3 +89,5 @@ start_pre() {
 		command_args="${command_args} --cd ${openvpn_dir}"
 	fi
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/polkitd b/init.d.misc/polkitd
index 63f1082b..c1e336e0 100644
--- a/init.d.misc/polkitd
+++ b/init.d.misc/polkitd
@@ -31,3 +31,5 @@ name="PolicyKit Daemon"
 depend() {
 	need dbus
 }
+
+# vim: set ts=4 :
diff --git a/init.d.misc/sshd b/init.d.misc/sshd
index 5e99cf7b..4a050617 100644
--- a/init.d.misc/sshd
+++ b/init.d.misc/sshd
@@ -53,3 +53,5 @@ start_pre() {
 
 	${command} -t	
 }
+
+# vim: set ts=4 :
diff --git a/init.d/checkroot b/init.d/checkroot
index ef491847..d751168a 100755
--- a/init.d/checkroot
+++ b/init.d/checkroot
@@ -32,7 +32,7 @@ depend() {
 
 do_mtab() {
 	# Don't create mtab if /etc is readonly
-	if ! cp /dev/null >/etc/mtab 2>/dev/null; then
+	if ! cp /dev/null /etc/mtab 2>/dev/null; then
 		ewarn "Skipping /etc/mtab initialization (ro root)"
 		return 0
 	fi
diff --git a/net.BSD/iwconfig.sh b/net.BSD/iwconfig.sh
index 512dea61..d33af4c9 100644
--- a/net.BSD/iwconfig.sh
+++ b/net.BSD/iwconfig.sh
@@ -591,4 +591,4 @@ iwconfig_post_stop() {
 	#iwconfig "${IFACE}" txpower 0 2>/dev/null
 }
 
-# vim: set ts=4 
+# vim: set ts=4 :
diff --git a/runlevels.mk b/runlevels.mk
index bb27d5bb..d6fe434f 100644
--- a/runlevels.mk
+++ b/runlevels.mk
@@ -16,3 +16,5 @@ install:
 
 all:
 clean:
+
+# vim: set ts=4 :
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index ea9e457c..eb7659d3 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -24,10 +24,11 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-# void single_user()
-#
-#  Drop to a shell, remount / ro, and then reboot
-#
+# udev needs this still
+try() {
+	"$@"
+}
+
 single_user() {
 	if [ "${RC_SYS}" = "VPS" ]; then
 		einfo "Halting"
@@ -99,7 +100,7 @@ mount_svcdir() {
 	fi
 }
 
-_rc_get_kv_cache=""
+_rc_get_kv_cache=
 get_KV() {
 	[ -z "${_rc_get_kv_cache}" ] \
 		&& _rc_get_kv_cache="$(uname -r)"
diff --git a/src/rc-update.c b/src/rc-update.c
index 38d48e03..e39db593 100644
--- a/src/rc-update.c
+++ b/src/rc-update.c
@@ -53,9 +53,9 @@ static char *applet = NULL;
  *   0 = no changes (nothing to do)
  *  1+ = number of runlevels updated
  */
-static ssize_t add (const char *runlevel, const char *service)
+static int add (const char *runlevel, const char *service)
 {
-	ssize_t retval = -1;
+	int retval = -1;
 
 	if (! rc_service_exists (service))
 		eerror ("%s: service `%s' does not exist", applet, service);
@@ -73,9 +73,9 @@ static ssize_t add (const char *runlevel, const char *service)
 	return (retval);
 }
 
-static ssize_t delete (const char *runlevel, const char *service)
+static int delete (const char *runlevel, const char *service)
 {
-	ssize_t retval = -1;
+	int retval = -1;
 
 	errno = 0;
 	if (rc_service_delete (runlevel, service)) {
@@ -235,9 +235,9 @@ int rc_update (int argc, char **argv)
 		if (! service)
 			eerror ("%s: no service specified", applet);
 		else {
-			ssize_t num_updated = 0;
-			ssize_t (*actfunc)(const char *, const char *);
-			size_t ret;
+			int num_updated = 0;
+			int (*actfunc)(const char *, const char *);
+			int ret;
 
 			if (action & DOADD) {
 				actfunc = add;