From f7e1ab25b2b79257d7e993d3cf9e6120ddb1f5ff Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sat, 3 Dec 2005 08:42:51 +0000 Subject: sync branch and trunk; fix typos svn path=/baselayout-vserver/trunk/; revision=140 --- etc/conf.d/rc | 6 +++--- etc/inittab | 7 +++---- init.d/dummy | 4 ++-- net-scripts/net.modules.d/helpers.d/dhcp | 2 +- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 2 +- net-scripts/net.modules.d/helpers.d/pump-wrapper | 2 +- sbin/MAKEDEV | 14 +++++++------- sbin/functions.sh | 4 ++-- sbin/rc | 10 ++++------ 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/etc/conf.d/rc b/etc/conf.d/rc index eb880fb..3387538 100644 --- a/etc/conf.d/rc +++ b/etc/conf.d/rc @@ -38,11 +38,11 @@ RC_AUTO_INTERFACE="no" # RC_VERBOSE will make init scripts more verbose. Only networking scripts # really use this at this time, and this is useful for trouble shooting # any issues you may have. -# + RC_VERBOSE="no" -# Set to "yes" if you want to use gentoo init style -# in the util-vserver configuration +# RC_INITSTYLE_HACK allows it to use the old (obsoleted) init style of +# util-vserver RC_INITSTYLE_HACK="no" diff --git a/etc/inittab b/etc/inittab index 17394c6..6f7795a 100644 --- a/etc/inittab +++ b/etc/inittab @@ -2,18 +2,17 @@ # # This file describes how the INIT process should set up # the system in a certain run-level. -# -# Default runlevel. +# Default runlevel id:3:initdefault: -# System initialization, mount local filesystems, etc. +# System initialization, mount local filesystems, etc si::sysinit:/sbin/rc sysinit # Further system initialization, brings up the boot runlevel. rc::bootwait:/sbin/rc boot -l0:0:wait:/sbin/rc shutdown +l0:0:wait:/sbin/rc shutdown l1:S1:wait:/sbin/rc default l2:2:wait:/sbin/rc default l3:3:wait:/sbin/rc default diff --git a/init.d/dummy b/init.d/dummy index cd8ed45..de50a10 100755 --- a/init.d/dummy +++ b/init.d/dummy @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 start() { - return 0 + return 0 } stop() { - return 0 + return 0 } # vim:ts=4 diff --git a/net-scripts/net.modules.d/helpers.d/dhcp b/net-scripts/net.modules.d/helpers.d/dhcp index f22e5ce..bfde3b1 100755 --- a/net-scripts/net.modules.d/helpers.d/dhcp +++ b/net-scripts/net.modules.d/helpers.d/dhcp @@ -54,7 +54,7 @@ macnet_pre_start "${interface}" 1>/dev/null # Map wireless ESSID variables to interface variables if [[ -n ${wireless_module} ]]; then - if wireless_check_extensions "${interface}" ; then + if wireless_exists "${interface}" ; then essidnet_pre_start "${interface}" 1>/dev/null fi fi diff --git a/net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper b/net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper index 279a417..4b4774f 100755 --- a/net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper +++ b/net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper @@ -21,7 +21,7 @@ macnet_pre_start "${interface}" 1>/dev/null # Map wireless ESSID variables to interface variables if [[ -n ${wireless_module} ]]; then - if wireless_check_extensions "${interface}" ; then + if wireless_exists "${interface}" ; then essidnet_pre_start "${interface}" 1>/dev/null fi fi diff --git a/net-scripts/net.modules.d/helpers.d/pump-wrapper b/net-scripts/net.modules.d/helpers.d/pump-wrapper index e5136e7..2a3dacc 100755 --- a/net-scripts/net.modules.d/helpers.d/pump-wrapper +++ b/net-scripts/net.modules.d/helpers.d/pump-wrapper @@ -19,7 +19,7 @@ if [[ ${action} == "up" ]]; then # Map wireless ESSID variables to interface variables if [[ -n ${wireless_module} ]]; then - if wireless_check_extensions "${interface}" ; then + if wireless_exists "${interface}" ; then essidnet_pre_start "${interface}" 1>/dev/null fi fi diff --git a/sbin/MAKEDEV b/sbin/MAKEDEV index 4a28ad3..a826c33 100755 --- a/sbin/MAKEDEV +++ b/sbin/MAKEDEV @@ -1,5 +1,5 @@ #! /bin/sh - -# $Id: MAKEDEV 1421 2005-08-23 23:56:23Z vapier $ +# $Id: MAKEDEV 1577 2005-10-19 00:07:16Z vapier $ #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---# # Customisation: @@ -568,14 +568,14 @@ do makedev random c 1 8 $public makedev urandom c 1 9 $readable makedev tty c 5 0 $tty - - # generate only a few ptys - for i in `seq 0 5`; do - makedev ptyp$i c 2 $i $tty - makedev ttyp$i c 3 $i $tty - done $0 $opts fd $0 $opts ptmx + # Just generate a few pty's, since openvz depends on those + # for vzctl enter + for i in `seq 0 5`; do + makedev ptyp$i c 2 $i $tty + makedev ttyp$i c 3 $i $tty + done ;; generic-*) echo "$0: no support for generic on this arch" >&2 diff --git a/sbin/functions.sh b/sbin/functions.sh index e635de1..162dd94 100755 --- a/sbin/functions.sh +++ b/sbin/functions.sh @@ -104,10 +104,10 @@ setup_defaultlevels() { get_bootconfig if [[ -z ${SOFTLEVEL} ]] ; then - if [[ -f ${svcdir}/softlevel ]] ; then + if [[ -f "${svcdir}/softlevel" ]] ; then export SOFTLEVEL=$(< "${svcdir}/softlevel") else - export SOFTLEVEL=${BOOTLEVEL} + export SOFTLEVEL="${BOOTLEVEL}" fi fi diff --git a/sbin/rc b/sbin/rc index 2321579..a0ba96a 100755 --- a/sbin/rc +++ b/sbin/rc @@ -3,7 +3,6 @@ # Distributed under the terms of the GNU General Public License v2 trap ":" INT QUIT TSTP - source /sbin/functions.sh umask 022 @@ -157,8 +156,7 @@ dep_stop() { # (or hotplut) might have started it (net.ppp?) ... if net_service "${myservice}" && \ [[ ${SOFTLEVEL} != "reboot" && \ - ${SOFTLEVEL} != "shutdown" && \ - ${SOFTLEVEL} != "single" ]] ; then + ${SOFTLEVEL} != "shutdown" ]] ; then if [[ -z ${OLDSOFTLEVEL} ]] || \ ! in_runlevel "${myservice}" "${OLDSOFTLEVEL}" ; then # This service is not in the previous runlevel, so @@ -240,13 +238,13 @@ if [[ ${SOFTLEVEL} == "reboot" || ${SOFTLEVEL} == "shutdown" ]] ; then # should help speed things up a bit rm -rf $(ls -d1 "${svcdir}/"* 2>/dev/null | \ grep -ve '\(depcache\|deptree\|envcache\)') - + # Need try(), etc source "${svclib}"/sh/init-functions.sh source /etc/init.d/halt.sh - - # we just die here since we have no init + + # we just die here since we have no init # and we should be the last running process if [[ ${RC_INITSTYLE_HACK} == "yes" ]] ; then exit 0 -- cgit v1.2.3-65-gdbad