diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | init.d/halt.sh | 2 | ||||
| -rw-r--r-- | net-scripts/net/iwconfig.sh | 4 | ||||
| -rw-r--r-- | net-scripts/net/pppd.sh | 3 | ||||
| -rw-r--r-- | net-scripts/net/udhcpc.sh | 2 | ||||
| -rwxr-xr-x | sbin/runscript.sh | 4 | ||||
| -rwxr-xr-x | tarball.sh | 2 |
7 files changed, 17 insertions, 8 deletions
@@ -1,6 +1,14 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 +* baselayout-1.12.6 (02 Nov 2006) + + 02 Nov 2006; Roy Marples <uberlord@gentoo.org>: + + We no longer unmount ramfs in halt.sh, #151128 + We no longer use =~ for the 1.12 branch only as we should work on all + bash versions, #151108 + 01 Nov 2006; Roy Marples <uberlord@gentoo.org>: Clarified pppd maxfail usage, #153657 thanks to Toralf Förster. diff --git a/init.d/halt.sh b/init.d/halt.sh index 0e373318..3f0e84df 100755 --- a/init.d/halt.sh +++ b/init.d/halt.sh @@ -14,7 +14,7 @@ # set, else the default one should be used for normal boots. # say: RC_NO_UMOUNTS="/mnt/livecd|/newroot" RC_NO_UMOUNTS=${RC_NO_UMOUNTS:-/mnt/livecd|/newroot} -RC_NO_UMOUNT_FS="^(proc|devpts|sysfs|devfs|tmpfs|usb(dev)?fs|unionfs|rootfs)$" +RC_NO_UMOUNT_FS="^(proc|devpts|sysfs|devfs|ramfs|tmpfs|usb(dev)?fs|unionfs|rootfs)$" # Reset pam_console permissions if we are actually using it if [[ -x /sbin/pam_console_apply && ! -c /dev/.devfsd && \ diff --git a/net-scripts/net/iwconfig.sh b/net-scripts/net/iwconfig.sh index e2ea7620..40930783 100644 --- a/net-scripts/net/iwconfig.sh +++ b/net-scripts/net/iwconfig.sh @@ -64,7 +64,7 @@ iwconfig_exists() { && return 0 [[ ! -e /proc/net/wireless ]] && return 1 - [[ $(</proc/net/wireless) =~ $'\n'"[ \t]*$1:" ]] + grep -q "^[ \t]*$1:" /proc/net/wireless } # char* iwconfig_get_wep_status(char *interface) @@ -74,7 +74,7 @@ iwconfig_exists() { iwconfig_get_wep_status() { local mode= status="disabled" - if [[ $(iwconfig "$1") =~ $'\n'" +Encryption key:[0-9,A-F]" ]]; then + if iwconfig "$1" | grep -qE "^ +Encryption key:[0-9,A-F]" ; then status="enabled" mode=$(iwconfig "$1" | sed -n -e 's/^.*Security mode:\(.*[^ ]\).*/\1/p') [[ -n ${mode} ]] && mode=" - ${mode}" diff --git a/net-scripts/net/pppd.sh b/net-scripts/net/pppd.sh index 7a19185b..3b3a5b96 100644 --- a/net-scripts/net/pppd.sh +++ b/net-scripts/net/pppd.sh @@ -177,7 +177,8 @@ pppd_start() { fi if [[ " ${opts} " == *" plugin pppoatm.so "* ]] ; then - if [[ ${!link} =~ '^[ \t]*([1-9]*[0-9]\.){1,2}[1-9]*[0-9][ \t]*$' ]] ; then + #if [[ ${!link} =~ '^[ \t]*([1-9]*[0-9]\.){1,2}[1-9]*[0-9][ \t]*$' ]] ; then + if echo "${!link}" | grep -qE '^[ \t]*([1-9]*[0-9]\.){1,2}[1-9]*[0-9][ \t]*$' ; then insert_link_in_opts=0 else ewarn "WARNING: An [itf.]vpi.vci ATM address was expected in ${link}" diff --git a/net-scripts/net/udhcpc.sh b/net-scripts/net/udhcpc.sh index c3741391..3dcf0610 100644 --- a/net-scripts/net/udhcpc.sh +++ b/net-scripts/net/udhcpc.sh @@ -82,7 +82,7 @@ udhcpc_start() { [[ -z ${!d} ]] && d="dhcp" if [[ " ${!d} " != *" nosendhost "* ]]; then - if [[ ! " ${opts}" =~ " -([hH] |-hostname=)" ]]; then + if [[ " ${opts} " != *" -"[hH]" "* && " ${opts} " != *" --hostname="* ]] ; then local hname=$(hostname) [[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \ && opts="${opts} --hostname=${hname}" diff --git a/sbin/runscript.sh b/sbin/runscript.sh index 2206f7ad..deafe4c8 100755 --- a/sbin/runscript.sh +++ b/sbin/runscript.sh @@ -591,7 +591,7 @@ for arg in $* ; do rm -rf "${svcdir}/snapshot/$$" mkdir -p "${svcdir}/snapshot/$$" cp -pP "${svcdir}"/started/* "${svcdir}"/inactive/* \ - "${svcdir}/snapshot/$$/" + "${svcdir}/snapshot/$$/" 2>/dev/null rm -f "${svcdir}/snapshot/$$/${SVCNAME}" fi @@ -637,7 +637,7 @@ for arg in $* ; do rm -rf "${svcdir}/snapshot/$$" mkdir -p "${svcdir}/snapshot/$$" cp -pP "${svcdir}"/started/* "${svcdir}"/inactive/* \ - "${svcdir}/snapshot/$$/" + "${svcdir}/snapshot/$$/" 2>/dev/null rm -f "${svcdir}/snapshot/$$/${SVCNAME}" # Simple way to try and detect if the service use svc_{start,stop} @@ -1,6 +1,6 @@ #!/bin/bash export TMP="${TMP:-/tmp}" -export V="1.12.5" +export V="1.12.6" export NAME="baselayout" export DEST="${TMP}/${NAME}-${V}" |