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.

This commit is contained in:
Roy Marples 2007-12-14 20:09:53 +00:00
parent 584cea1f8e
commit afdcf1fa15
19 changed files with 50 additions and 44 deletions

View File

@ -56,3 +56,6 @@ install:: $(BIN) $(CONF) $(CONF_APPEND)
$(INSTALL) -m 0644 $$x $(DESTDIR)$(DIR) || exit $$?; \
fi; \
done
# vim: set ts=4 :

View File

@ -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

View File

@ -103,4 +103,4 @@ start() {
eend 0
}
# vim:ts=4
# vim: set ts=4 :

View File

@ -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 :

View File

@ -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 :

View File

@ -35,3 +35,5 @@ start() {
sysctl -p /etc/sysctl.conf >/dev/null
eend $?
}
# vim: set ts=4 :

View File

@ -36,3 +36,5 @@ depend() {
start_pre() {
mkdir -p $(dirname $pidfile)
}
# vim: set ts=4 :

View File

@ -41,3 +41,5 @@ reload() {
start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
eend $?
}
# vim: set ts=4 :

View File

@ -31,3 +31,5 @@ name="Hardware Abstraction Layer Daemon"
depend() {
need dbus
}
# vim: set ts=4 :

View File

@ -114,3 +114,5 @@ stop_post() {
umount "${named_chroot}"/dev 2>/dev/null || true
fi
}
# vim: set ts=4 :

View File

@ -57,3 +57,5 @@ start_pre() {
command_args="${command_args} -u ntpd:ntpd -i ${ntpd_chroot}"
fi
}
# vim: set ts=4 :

View File

@ -89,3 +89,5 @@ start_pre() {
command_args="${command_args} --cd ${openvpn_dir}"
fi
}
# vim: set ts=4 :

View File

@ -31,3 +31,5 @@ name="PolicyKit Daemon"
depend() {
need dbus
}
# vim: set ts=4 :

View File

@ -53,3 +53,5 @@ start_pre() {
${command} -t
}
# vim: set ts=4 :

View File

@ -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

View File

@ -591,4 +591,4 @@ iwconfig_post_stop() {
#iwconfig "${IFACE}" txpower 0 2>/dev/null
}
# vim: set ts=4
# vim: set ts=4 :

View File

@ -16,3 +16,5 @@ install:
all:
clean:
# vim: set ts=4 :

View File

@ -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)"

View File

@ -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;