diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLog.vserver | 14 | ||||
| -rwxr-xr-x | bin/rc-status | 8 | ||||
| -rwxr-xr-x | net-scripts/init.d/net.lo | 2 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/dhcpcd | 2 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/helpers.d/functions | 2 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/iproute2 | 2 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/iwconfig | 4 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/pump | 2 |
9 files changed, 42 insertions, 7 deletions
@@ -1,6 +1,19 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2 + 28 Nov 2005; Roy Marples <uberlord@gentoo.org>: + + Fixed fallback_routes, #113776. + Fixed variable array references, #113661. + Fixed iwconfig mode selection, #113677 - thanks to Tuan Van. + Fixed iproute2 is_up check, #113672 - thanks to Georgi Georgiev. + Added information about the "broken" status as reported by rc-status to + its output, #113755. + + 27 Nov 2005; Mike Frysinger <vapier@gentoo.org>: + + Don't set default RC_VOLUME_ORDER anymore in functions.sh #113700. + 24 Nov 2005; Roy Marples <uberlord@gentoo.org>: ifconfig routes now work with metrics and older configs again diff --git a/ChangeLog.vserver b/ChangeLog.vserver index 90ad4af..dc480b5 100644 --- a/ChangeLog.vserver +++ b/ChangeLog.vserver @@ -1,6 +1,20 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2 + 28 Nov 2005; Christian Heim <phreak@gentoo.org>: + Import the latest baselayout changes. Merging revision 1634. + + ChangeLog | 13 +++++++++++++ + ChangeLog.vserver | 14 ++++++++++++++ + bin/rc-status | 8 ++++++++ + net-scripts/init.d/net.lo | 2 +- + net-scripts/net.modules.d/dhcpcd | 2 +- + net-scripts/net.modules.d/helpers.d/functions | 2 +- + net-scripts/net.modules.d/iproute2 | 2 +- + net-scripts/net.modules.d/iwconfig | 4 ++-- + net-scripts/net.modules.d/pump | 2 +- + 9 files changed, 42 insertions(+), 7 deletions(-) + 24 Nov 2005; Christian Heim <phreak@gentoo.org>: Import latest fixup for the _pre11 release (fixing several bugs). Merging revision 1629. diff --git a/bin/rc-status b/bin/rc-status index 7aba912..299383c 100755 --- a/bin/rc-status +++ b/bin/rc-status @@ -204,6 +204,7 @@ else boot_crit="checkroot hostname modules checkfs localmount clock" fi +broken="" for level in ${runlevelidxs} ; do echo "Runlevel: ${HILITE}${level}${NORMAL}" for service in ${runlevels[${arridx}]} ; do @@ -212,6 +213,7 @@ for level in ${runlevelidxs} ; do ]] && [[ ${level} != "${BOOTLEVEL}" \ || " ${boot_crit} " != *" ${service} "* ]]; then print_msg "${service}" "${BAD}" 'broken ' + broken="${broken} ${service}" elif [[ -n ${inactive} && $(in_list "${inactive}" "${service}") -eq 1 ]] ; then print_msg "${service}" "${WARN}" 'inactive' elif [[ $(in_list "${started}" "${service}") -eq 1 ]] ; then @@ -227,3 +229,9 @@ for level in ${runlevelidxs} ; do let "arridx += 1" [ -n "${UNUSED}" ] && exit 0 done + +if [[ -n ${broken} ]]; then + eerror "You have some broken symbolic links as reported by the broken" + eerror "status above. This can be fixed by removing the broken service" + eerror "from its runlevel and re-adding it back using rc-update." +fi diff --git a/net-scripts/init.d/net.lo b/net-scripts/init.d/net.lo index 761966c..e1eabf9 100755 --- a/net-scripts/init.d/net.lo +++ b/net-scripts/init.d/net.lo @@ -640,7 +640,7 @@ iface_start() { # Do we have a fallback route? if [[ -n ${fallback_route[config_counter]} ]]; then x="fallback_route[config_counter]" - eval "routes_${ifvar}=( ${!x} )" + eval "routes_${ifvar}=( \"\${!x}\" )" fallback_route[config_counter]="" fi diff --git a/net-scripts/net.modules.d/dhcpcd b/net-scripts/net.modules.d/dhcpcd index 50c9760..9d8aa14 100644 --- a/net-scripts/net.modules.d/dhcpcd +++ b/net-scripts/net.modules.d/dhcpcd @@ -111,7 +111,7 @@ dhcpcd_start() { [[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}" # Instruct dhcpcd to use our wrapper - opts="${opts} -c \"${svcdir}/net.modules.d/helpers.d/dhcpcd-wrapper\"" + opts="${opts} -c \"${svclib}/net.modules.d/helpers.d/dhcpcd-wrapper\"" # Instruct dhcpcd to create it's files in our state dir opts="${opts} -e \"${statedir}/${iface}\"" diff --git a/net-scripts/net.modules.d/helpers.d/functions b/net-scripts/net.modules.d/helpers.d/functions index ba184dc..a16cdb7 100644 --- a/net-scripts/net.modules.d/helpers.d/functions +++ b/net-scripts/net.modules.d/helpers.d/functions @@ -568,7 +568,7 @@ configure_variables() { x="" [[ -n ${option2} ]] && x="${v}_${option2}[@]" [[ -z ${!x} ]] && x="${v}_${option1}[@]" - [[ -n ${!x} ]] && eval "${v}_${ifvar}=( \"${!x}\" )" + [[ -n ${!x} ]] && eval "${v}_${ifvar}=( \"\${!x}\" )" done done diff --git a/net-scripts/net.modules.d/iproute2 b/net-scripts/net.modules.d/iproute2 index b9d0bed..f734e77 100644 --- a/net-scripts/net.modules.d/iproute2 +++ b/net-scripts/net.modules.d/iproute2 @@ -72,7 +72,7 @@ iproute2_down() { iproute2_is_up() { local check="\<UP\>" addr="${2:-false}" ${addr} && check="${check}.*inet " - ip addr show "$1" | grep -Eq "${check}" && return 0 + ip addr show "$1" | xargs | grep -Eq "${check}" && return 0 return 1 } diff --git a/net-scripts/net.modules.d/iwconfig b/net-scripts/net.modules.d/iwconfig index 09c0c32..53dcaa9 100644 --- a/net-scripts/net.modules.d/iwconfig +++ b/net-scripts/net.modules.d/iwconfig @@ -130,7 +130,7 @@ iwconfig_report() { local mode=$( iwconfig_get_mode "${iface}" ) if [[ ${mode} == "master" ]]; then m="as" - else + elif [[ ${mode} != "ad-hoc" ]]; then mac=$( iwconfig_get_ap_mac_address "${iface}" ) [[ -n ${mac} ]] && mac=" at ${mac}" fi @@ -752,7 +752,7 @@ iwconfig_configure() { # Setup ad-hoc mode? x="mode_${ifvar}" - x=$( echo "${!mode:-managed}" | tr '[:upper:]' '[:lower:]' ) + x=$( echo "${!x:-managed}" | tr '[:upper:]' '[:lower:]' ) if [[ ${x} == "ad-hoc" || ${x} == "master" ]]; then iwconfig_setup_specific "${iface}" "${x}" return $? diff --git a/net-scripts/net.modules.d/pump b/net-scripts/net.modules.d/pump index 6b7d86b..bb8be39 100644 --- a/net-scripts/net.modules.d/pump +++ b/net-scripts/net.modules.d/pump @@ -82,7 +82,7 @@ pump_start() { [[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}" opts="${opts} --win-client-ident --etc-dir=${statedir}/${iface}" - opts="${opts} --script ${svcdir}/net.modules.d/helpers.d/pump-wrapper" + opts="${opts} --script \"${svclib}/net.modules.d/helpers.d/pump-wrapper\"" opts="${opts} --keep-up --interface ${iface}" # Bring up DHCP for this interface (or alias) |