From b5141c17bfc6ebfdaf440a1d997b7d897e242820 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Thu, 10 Feb 2011 15:07:28 -0600 Subject: remove network device naming requirement from VLAN devices --- sysconfig/network-scripts/ifup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 1eaabab8..d296508b 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -73,9 +73,9 @@ fi # Ethernet 802.1Q VLAN support if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then VID="" - MATCH='^(eth|hsi|bond)[0-9]+\.[0-9]{1,4}$' + MATCH='^.+\.[0-9]{1,4}$' if [[ "${DEVICE}" =~ $MATCH ]]; then - VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^[a-z0-9]*\.0*\([0-9]\+\)/\1/') + VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^.*\.\([0-9]\+\)/\1/') PHYSDEV=${DEVICE%.*} fi MATCH='^vlan[0-9]{1,4}?' -- cgit v1.2.1 From decf19bb9dc7b70ad89f9154899e73df069f5e62 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Feb 2011 16:41:25 -0500 Subject: Call sync after nfs unmount, otherwise we'll hang when the kernel syncs later. (#637500) --- rc.d/init.d/netfs | 1 + 1 file changed, 1 insertion(+) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 8d9854fb..3713cf45 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -116,6 +116,7 @@ case "$1" in $"Unmounting NFS filesystems: " \ $"Unmounting NFS filesystems (retry): " \ "-f -l" + sync fi if [ -n "$CIFSMTAB" ]; then for MNT in $CIFSMTAB; do -- cgit v1.2.1 From 2fd651f8a8b8df4a6e0ea335b3a040bf505ba12b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Feb 2011 16:47:27 -0500 Subject: Make more accurate. --- inittab.systemd | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inittab.systemd b/inittab.systemd index 59f09e94..3143379d 100644 --- a/inittab.systemd +++ b/inittab.systemd @@ -2,10 +2,14 @@ # # ADDING CONFIGURATION HERE WILL HAVE NO EFFECT ON YOUR SYSTEM. # -# Non-SysV tasks for individual runlevels live in /lib/systemd/system/runlevelX.target.wants -# # Ctrl-Alt-Delete is handled by /etc/systemd/system/ctrl-alt-del.target # -# To set a default runlevel , run: +# systemd uses 'targets' instead of runlevels. By default, there are two main targets: +# +# multi-user.target: analagous to runlevel 3 +# graphical.target: analagous to runlevel 5 +# +# To set a default target, run: +# +# ln -s /lib/systemd/system/.target /etc/systemd/system/default.target # -# ln -s /lib/systemd/system/runlevel.target /etc/systemd/system/default.target -- cgit v1.2.1 From 681717364c786083356ebe5d92c4cc6fd73af307 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 14:46:25 -0500 Subject: Allow for plymouth to enter non-LUKS passphrases (#621158, ) --- rc.d/init.d/functions | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 3f2cbc50..3eddf1ea 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -786,10 +786,16 @@ init_crypto() { rc=$? fi else - [ -z "$key" ] && plymouth --hide-splash - /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 2>/dev/null && success || failure - rc=$? - [ -z "$key" ] && plymouth --show-splash + if [ -z "$key" ]; then + mount_point="$(find_crypto_mount_point $dst)" + [ -n "$mount_point" ] || mount_point=${src##*/} + prompt=$(printf $"%s is password protected" "$mount_point") + plymouth ask-for-password --prompt "$prompt" --command="/sbin/cryptsetup $params create $dst $src" <&1 + rc=$? + else + /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 2>/dev/null && success || failure + rc=$? + fi fi if [ $rc -ne 0 ]; then ret=1 -- cgit v1.2.1 From 5212d0a596d67bbd2f5effdd3686c123f778078f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 21 Feb 2010 21:21:48 +0200 Subject: Drop some unnecessary command invocations. --- lang.csh | 4 ++-- ppp/ip-down.ipv6to4 | 4 ++-- ppp/ip-up.ipv6to4 | 10 +++++----- ppp/ipv6-up | 2 +- rc.d/init.d/functions | 6 +++--- sysconfig/network-scripts/ifdown-ipv6 | 4 ++-- sysconfig/network-scripts/ifdown-sit | 2 +- sysconfig/network-scripts/ifup-ipv6 | 10 +++++----- sysconfig/network-scripts/ifup-ipx | 2 +- sysconfig/network-scripts/ifup-sit | 4 ++-- sysconfig/network-scripts/network-functions | 5 ++--- sysconfig/network-scripts/network-functions-ipv6 | 12 ++++++------ 12 files changed, 32 insertions(+), 33 deletions(-) diff --git a/lang.csh b/lang.csh index caa058bc..e8560b24 100755 --- a/lang.csh +++ b/lang.csh @@ -5,7 +5,7 @@ set sourced=0 if ($?LANG) then set saved_lang=$LANG if ( -f "$HOME/.i18n" ) then - eval `grep -v '^[[:blank:]]*#' "$HOME/.i18n" | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'` + eval `sed -ne 's|^[[:blank:]]*\([^#=]\{1,\}\)=\([^=]*\)|setenv \1 \2;|p' "$HOME/.i18n"` set sourced=1 endif setenv LANG $saved_lang @@ -13,7 +13,7 @@ if ($?LANG) then else foreach file (/etc/sysconfig/i18n "$HOME/.i18n") if ( -f $file ) then - eval `grep -v '^[[:blank:]]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'` + eval `sed -ne 's|^[[:blank:]]*\([^#=]\{1,\}\)=\([^=]*\)|setenv \1 \2;|p' $file` set sourced=1 endif end diff --git a/ppp/ip-down.ipv6to4 b/ppp/ip-down.ipv6to4 index d6e50b54..29f1c646 100644 --- a/ppp/ip-down.ipv6to4 +++ b/ppp/ip-down.ipv6to4 @@ -48,7 +48,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') +REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then @@ -104,7 +104,7 @@ if [ "$valid6to4config" = "yes" ]; then if [ -n "$IPV6TO4_ROUTING" ]; then # Delete routes to local networks for devsuf in $IPV6TO4_ROUTING; do - dev="$(echo $devsuf | awk -F- '{ print $1 }')" + dev="${devsuf%%-*}" ipv6_cleanup_6to4_device $dev done fi diff --git a/ppp/ip-up.ipv6to4 b/ppp/ip-up.ipv6to4 index b2f6e6e6..6343fbc5 100644 --- a/ppp/ip-up.ipv6to4 +++ b/ppp/ip-up.ipv6to4 @@ -54,7 +54,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') +REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then @@ -104,7 +104,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ "$valid6to4config" = "yes" ]; then # Delete routes to local networks for devsuf in $IPV6TO4_ROUTING; do - dev="$(echo $devsuf | awk -F- '{ print $1 }')" + dev="${devsuf%%-*}" ipv6_cleanup_6to4_device $dev done @@ -112,7 +112,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then ipv6_cleanup_6to4_tunnels tun6to4 # Get MTU of master device - ipv4mtu="$(/sbin/ip link show dev $DEVICE | grep -w "mtu" | awk '{ print $5 }')" + ipv4mtu="$(/sbin/ip link show dev $DEVICE | awk '/\/ { print $5 }')" if [ -n "$ipv4mtu" ]; then # IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header tunnelmtu=$[ $ipv4mtu - 20 ] @@ -155,7 +155,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-tun6to4" ]; then - cat "/etc/sysconfig/network-scripts/route6-tun6to4" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do + sed -ne 's/#.*//' -e '/[^[:space:]]/p' /etc/sysconfig/network-scripts/route6-tun6to4 | while read line; do if echo "$line" | grep -vq 'via'; then # Add gateway if missing line="$line via $ipv6to4_relay" @@ -178,7 +178,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$ipv6to4prefix" ]; then # Add IPv6 address to interface (required interface route will be set automatically) for devsuf in $IPV6TO4_ROUTING; do - dev="$(echo $devsuf | awk -F- '{ print $1 }')" + dev="${devsuf%%-*}" suf="$(echo $devsuf | awk -F- '{ print $2 }')" ipv6_add_addr_on_device ${dev} ${ipv6to4prefix}${suf} done diff --git a/ppp/ipv6-up b/ppp/ipv6-up index 06062cfa..54219e43 100644 --- a/ppp/ipv6-up +++ b/ppp/ipv6-up @@ -97,7 +97,7 @@ fi # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then - cat "/etc/sysconfig/network-scripts/route6-$DEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do + sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do /sbin/ip -6 route add $line done fi diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 3eddf1ea..63d1190e 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -671,7 +671,7 @@ find_crypto_mount_point() { # Because of a chicken/egg problem, init_crypto must be run twice. /var may be # encrypted but /var/lib/random-seed is needed to initialize swap. init_crypto() { - local have_random dst src key opt mode owner params makeswap skip arg opt + local have_random dst src key opt lsl owner params makeswap skip arg opt local param value rc ret mke2fs mdir prompt mount_point ret=0 @@ -686,8 +686,8 @@ init_crypto() { if test -e "$key" ; then owner=$(ls -l $key | (read a b owner rest; echo $owner)) if ! key_is_random "$key"; then - mode=$(ls -l "$key" | cut -c 5-10) - if [ "$mode" != "------" ]; then + lsl=$(ls -l "$key") + if [ "${lsl:4:6}" != "------" ]; then echo $"INSECURE MODE FOR $key" fi fi diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6 index 9f04531a..51c4028f 100755 --- a/sysconfig/network-scripts/ifdown-ipv6 +++ b/sysconfig/network-scripts/ifdown-ipv6 @@ -46,7 +46,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') +REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 @@ -120,7 +120,7 @@ if [ "$valid6to4config" = "yes" ]; then if [ -n "$IPV6TO4_ROUTING" ]; then # Delete routes to local networks for devsuf in $IPV6TO4_ROUTING; do - dev="$(echo $devsuf | awk -F- '{ print $1 }')" + dev="${devsuf%%-*}" ipv6_cleanup_6to4_device $dev done fi diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit index 041dc3cd..314b91f1 100755 --- a/sysconfig/network-scripts/ifdown-sit +++ b/sysconfig/network-scripts/ifdown-sit @@ -28,7 +28,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') +REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index da1062ec..6f104dc5 100755 --- a/sysconfig/network-scripts/ifup-ipv6 +++ b/sysconfig/network-scripts/ifup-ipv6 @@ -63,7 +63,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') +REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 # Test whether IPv6 configuration is enabled for this interface, else stop @@ -162,7 +162,7 @@ fi # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then - cat "/etc/sysconfig/network-scripts/route6-$DEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do + sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do /sbin/ip -6 route add $line done fi @@ -222,7 +222,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Setup 6to4 tunnel (hardwired name is "tun6to4"), if config is valid if [ "$valid6to4config" = "yes" ]; then # Get MTU of master device - ipv4mtu="$(/sbin/ip link show dev $DEVICE | grep -w "mtu" | awk '{ print $5 }')" + ipv4mtu="$(/sbin/ip link show dev $DEVICE | awk '/\/ { print $5 }')" if [ -n "$ipv4mtu" ]; then # IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header tunnelmtu=$(($ipv4mtu-20)) @@ -264,7 +264,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-tun6to4" ]; then - cat "/etc/sysconfig/network-scripts/route6-tun6to4" | sed 's/#.*//g' | LC_ALL=C grep -v '^[[:space:]]*$' | while read line; do + sed -ne 's/#.*//' -e '/[^[:space:]]/p' /etc/sysconfig/network-scripts/route6-tun6to4 | while read line; do if echo "$line" | LC_ALL=C grep -vq 'via'; then # Add gateway if missing line="$line via $ipv6to4_relay" @@ -288,7 +288,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$ipv6to4prefix" ]; then # Add route to local networks for devsuf in $IPV6TO4_ROUTING; do - dev="$(echo $devsuf | awk -F- '{ print $1 }')" + dev="${devsuf%%-*}" suf="$(echo $devsuf | awk -F- '{ print $2 }')" ipv6_add_addr_on_device ${dev} ${ipv6to4prefix}${suf} done diff --git a/sysconfig/network-scripts/ifup-ipx b/sysconfig/network-scripts/ifup-ipx index a5693cfe..dbd294a8 100755 --- a/sysconfig/network-scripts/ifup-ipx +++ b/sysconfig/network-scripts/ifup-ipx @@ -23,7 +23,7 @@ CONFIG=$1 source_config for frametype in 802.2 802.3 ETHERII SNAP ; do - framename=$(echo $frametype | sed 's/\./_/') + framename=${frametype/./_} eval ACT=\$IPXACTIVE_$framename case $ACT in yes|true) diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit index f593a677..6d1a8c79 100755 --- a/sysconfig/network-scripts/ifup-sit +++ b/sysconfig/network-scripts/ifup-sit @@ -40,7 +40,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') +REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 # Test whether IPv6 configuration is enabled for this interface, else stop @@ -106,7 +106,7 @@ fi # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-$REALDEVICE" ]; then - cat "/etc/sysconfig/network-scripts/route6-$REALDEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do + sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$REALDEVICE" | while read line; do /sbin/ip -6 route add $line done fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 562fe7cb..0d2528ee 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -51,7 +51,7 @@ get_config_by_name () get_device_by_hwaddr () { - LANG=C ip -o link | grep -v link/ieee802.11 | awk -F ': ' -vIGNORECASE=1 "/$1/ { print \$2 }" + LANG=C ip -o link | awk -F ': ' -vIGNORECASE=1 '!/link\/ieee802\.11/ && /'"$1"'/ { print $2 }' } get_uuid_by_config () @@ -207,9 +207,8 @@ do_netreport () ( cd /var/run/netreport || exit for i in * ; do if [ -f $i ]; then - OWNER=$(ls -l $i | awk '{ print $3 }') - if [ "$(id -u)" = "0" ]; then + OWNER=$(stat -c %U $i) su -s /bin/bash $OWNER -c "kill -SIGIO $i >/dev/null 2>&1 || rm -f $i >/dev/null 2>&1" > /dev/null 2>&1 else kill -SIGIO $i >/dev/null 2>&1 || rm -f $i >/dev/null 2>&1 diff --git a/sysconfig/network-scripts/network-functions-ipv6 b/sysconfig/network-scripts/network-functions-ipv6 index 24100cba..64b9b593 100644 --- a/sysconfig/network-scripts/network-functions-ipv6 +++ b/sysconfig/network-scripts/network-functions-ipv6 @@ -322,7 +322,7 @@ ipv6_add_addr_on_device() { # Extract address parts local prefixlength_implicit="$(echo $address | awk -F/ '{ print $2 }')" - local address_implicit="$(echo $address | awk -F/ '{ print $1 }')" + local address_implicit="${address%%/*}" # Check prefix length and using '64' as default if [ -z "$prefixlength_implicit" ]; then @@ -389,7 +389,7 @@ ipv6_cleanup_6to4_device() { ipv6_test testonly || return 2 # Cleanup 6to4 addresses on this device - /sbin/ip -6 addr show dev $dev scope global permanent | LC_ALL=C grep -w inet6 | awk '{ print $2}' | LC_ALL=C grep "^2002:" | while read addr; do + /sbin/ip -6 addr show dev $dev scope global permanent | awk '/\/ && $2 ~ /^2002:/ { print $2 }' | while read addr; do /sbin/ip -6 addr del ${addr} dev ${dev} done @@ -496,7 +496,7 @@ ipv6_create_6to4_prefix() { ipv6_log $"Missing parameter 'IPv4 address' (arg 1)" stderr.err $fn fi - local major1="$(echo $ipv4addr | awk -F. '{ print $1 }')" + local major1="${ipv4addr%%.*}" local minor1="$(echo $ipv4addr | awk -F. '{ print $2 }')" local major2="$(echo $ipv4addr | awk -F. '{ print $3 }')" local minor2="$(echo $ipv4addr | awk -F. '{ print $4 }')" @@ -654,7 +654,7 @@ ipv6_cleanup_6to4_tunnels() { ipv6_del_tunnel_device tun6to4 # Remove all unspecific unreachable routes for local 6to4 address space - /sbin/ip -6 route | LC_ALL=C grep "^unreachable 2002:" | LC_ALL=C grep "/48 dev lo" | while read token net rest; do + /sbin/ip -6 route | LC_ALL=C grep "^unreachable 2002:.*/48 dev lo" | while read token net rest; do /sbin/ip route del unreach $net done @@ -831,7 +831,7 @@ ipv6_cleanup_tunnel_devices() { # Find still existing tunnel devices and shutdown and delete them - /sbin/ip tunnel show | LC_ALL=C grep -w "ipv6/ip" | awk -F: '{ print $1 }' | while read device; do + /sbin/ip tunnel show | awk -F: '/\/ { print $1 }' | while read device; do ipv6_del_tunnel_device $device done @@ -987,7 +987,7 @@ ipv6_set_default_route() { fi if [ -n "$address" ]; then - local addressgw=$(echo $address | awk -F% '{ print $1 }') + local addressgw=${address%%%*} local device_scope=$(echo $address | awk -F% '{ print $2 }') if [ -z "$addressgw" ]; then -- cgit v1.2.1 From 8a4c7be4720b026e66c4e60078b3334fe1c4ab41 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 15:49:37 -0500 Subject: Add some more docs (#613722) --- crypttab.5 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crypttab.5 b/crypttab.5 index 73bd8aed..60f3845c 100644 --- a/crypttab.5 +++ b/crypttab.5 @@ -39,7 +39,8 @@ of the resulting encrypted block device; the device is set up at \fB/dev/mapper/\fIname\fR. -The second field contains a path to the underlying block device. +The second field contains a path to the underlying block device, +or a specification of a block device via UUID=. If the block device contains a LUKS signature, it is opened as a LUKS encrypted partition; otherwise it is assumed to be a raw dm-crypt partition. @@ -51,6 +52,8 @@ Otherwise the field is interpreted as a path to a file containing the encryption password. For swap encryption .B /dev/urandom +or the hardware device +.B /dev/hw_random can be used as the password file; using .B /dev/random @@ -85,6 +88,10 @@ for possible values and the default value of this option. If the the encryption password is read from console, it has to be entered twice (to prevent typos). +.TP +\fBnoauto\fR +This device will not be automatically unlocked on boot. + .TP \fBswap\fR The encrypted block device will be used as a swap partition, -- cgit v1.2.1 From ec2bee09f74293bf30cd06e62ae2a6845af09dda Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 15:53:12 -0500 Subject: Add support for noauto crypt devices, to mirror systemd. --- rc.d/init.d/functions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 63d1190e..5fd4742a 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -751,6 +751,9 @@ init_crypto() { skip="yes" fi ;; + noauto) + skip="yes" + ;; verify) params="$params -y" ;; -- cgit v1.2.1 From f662d4777625cd3bedea19cccabea7741a8b45c9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 16:24:01 -0500 Subject: Add GVRP support (#597598, ) --- sysconfig.txt | 3 +++ sysconfig/network-scripts/ifup | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sysconfig.txt b/sysconfig.txt index ee38d6af..7d03e0ed 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -744,6 +744,9 @@ Files in /etc/sysconfig/network-scripts/ ethernet packet and make assumptions about the location of bytes. If you don't need it turn it off because there is a small performance penalty. Default is on. + GVRP=yes|no + When enabled, this will announce new vlan creation to a GVRP + enabled trunk port on a switch. Default is off. PPP/SLIP items: PERSIST=yes|no diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index d296508b..0089f3e9 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -114,7 +114,11 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then FLAG_REORDER_HDR="reorder_hdr off" fi - ip link add dev ${DEVICE} link ${PHYSDEV} type vlan id ${VID} ${FLAG_REORDER_HDR} || { + if [ "${GVRP}" = "yes" -o "${GVRP}" = "1" ]; then + FLAG_GVRP="gvrp on" + fi + + ip link add dev ${DEVICE} link ${PHYSDEV} type vlan id ${VID} ${FLAG_REORDER_HDR} ${FLAG_GVRP} || { (/usr/bin/logger -p daemon.info -t ifup \ $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" &)& echo $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" -- cgit v1.2.1 From 9369bf1568b73061fe29670b4faae80c6507d56f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 16:31:09 -0500 Subject: Make killproc more granular when delay is passed. (#428029, ) --- rc.d/init.d/functions | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 5fd4742a..212ecee8 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -312,7 +312,7 @@ daemon() { # A function to stop a program. killproc() { - local RC killlevel= base pid pid_file= delay + local RC killlevel= base pid pid_file= delay try RC=0; delay=3 # Test syntax. @@ -355,11 +355,17 @@ killproc() { # TERM first, then KILL if not dead kill -TERM $pid >/dev/null 2>&1 usleep 100000 - if checkpid $pid && sleep 1 && - checkpid $pid && sleep $delay && - checkpid $pid ; then - kill -KILL $pid >/dev/null 2>&1 - usleep 100000 + if checkpid $pid ; then + try=0 + while [ $try -lt $delay ] ; do + checkpid $pid || break + sleep 1 + let try+=1 + done + if checkpid $pid ; then + kill -KILL $pid >/dev/null 2>&1 + usleep 100000 + fi fi fi checkpid $pid -- cgit v1.2.1 From 13f2ec05b5af5f57b6847b04185c6e710dc769b2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 16:34:56 -0500 Subject: Tweak waiting times slightly. (#596451) --- rc.d/init.d/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 212ecee8..da8d9794 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -354,7 +354,7 @@ killproc() { if checkpid $pid 2>&1; then # TERM first, then KILL if not dead kill -TERM $pid >/dev/null 2>&1 - usleep 100000 + usleep 50000 if checkpid $pid ; then try=0 while [ $try -lt $delay ] ; do @@ -364,7 +364,7 @@ killproc() { done if checkpid $pid ; then kill -KILL $pid >/dev/null 2>&1 - usleep 100000 + usleep 50000 fi fi fi -- cgit v1.2.1 From 3f296db591da779000a301b2b29560ee6df413f3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 28 Feb 2011 16:56:40 -0500 Subject: Move sysctl.conf/sysctl.d handling to a function, call it where appropriate. (#593211, continued) --- rc.d/init.d/functions | 9 +++++++++ rc.d/init.d/network | 4 ++-- rc.d/rc.sysinit | 6 +----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index da8d9794..7377f999 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -658,6 +658,15 @@ is_false() { return 1 } +# Apply sysctl settings, including files in /etc/sysctl.d +apply_sysctl() { + sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + for file in /etc/sysctl.d/* ; do + is_ignored_file "$file" && continue + test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1 + done +} + key_is_random() { [ "$1" = "/dev/urandom" -o "$1" = "/dev/hw_random" \ -o "$1" = "/dev/random" ] diff --git a/rc.d/init.d/network b/rc.d/init.d/network index b31060b0..738a3440 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -61,7 +61,7 @@ case "$1" in /etc/sysconfig/network-scripts/init.ipv6-global start pre fi - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + apply_sysctl # bring up loopback interface action $"Bringing up loopback interface: " ./ifup ifcfg-lo @@ -164,7 +164,7 @@ case "$1" in /etc/sysconfig/network-scripts/init.ipv6-global start post fi # Run this again to catch any interface-specific actions - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + apply_sysctl touch /var/lock/subsys/network diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index f8f701af..3973c444 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -151,11 +151,7 @@ mount -n /dev/pts >/dev/null 2>&1 # Configure kernel parameters update_boot_stage RCkernelparam -sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 -for file in /etc/sysctl.d/* ; do - is_ignored_file "$file" && continue - test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1 -done +apply_sysctl # Set the hostname. update_boot_stage RChostname -- cgit v1.2.1 From 8aba31240078aa1b4a7621715615743a73c9881f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 3 Feb 2011 20:45:43 +0200 Subject: Avoid some unnecessary stat calls. --- rc.d/rc.sysinit | 10 ++++------ systemd/fedora-storage-init | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 3973c444..ad2c83e5 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -194,7 +194,7 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then fi # Start any MD RAID arrays that haven't been started yet -[ -r /proc/mdstat -a -r /dev/md/md-device-map ] && /sbin/mdadm -IRs +[ -r /proc/mdstat ] && [ -r /dev/md/md-device-map ] && /sbin/mdadm -IRs if [ -x /sbin/lvm ]; then action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit @@ -204,7 +204,7 @@ if [ -f /etc/crypttab ]; then init_crypto 0 fi -if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then +if strstr "$cmdline" fastboot || [ -f /fastboot ]; then fastboot=yes fi @@ -212,7 +212,7 @@ if [ -f /fsckoptions ]; then fsckoptions=$(cat /fsckoptions) fi -if [ -f /forcefsck ] || strstr "$cmdline" forcefsck ; then +if strstr "$cmdline" forcefsck || [ -f /forcefsck ]; then fsckoptions="-f $fsckoptions" elif [ -f /.autofsck ]; then [ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck @@ -632,14 +632,12 @@ fi /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 # Boot time profiles. Yes, this should be somewhere else. -if [ -x /usr/sbin/system-config-network-cmd ]; then - if strstr "$cmdline" netprofile= ; then +if strstr "$cmdline" netprofile= && [ -x /usr/sbin/system-config-network-cmd ]; then for arg in $cmdline ; do if [ "${arg##netprofile=}" != "${arg}" ]; then /usr/sbin/system-config-network-cmd --profile ${arg##netprofile=} fi done - fi fi # Now that we have all of our basic modules loaded and the kernel going, diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init index b01a4657..7f439bd9 100755 --- a/systemd/fedora-storage-init +++ b/systemd/fedora-storage-init @@ -31,7 +31,7 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then fi # Start any MD RAID arrays that haven't been started yet -[ -r /proc/mdstat -a -r /dev/md/md-device-map ] && /sbin/mdadm -IRs +[ -r /proc/mdstat ] && [ -r /dev/md/md-device-map ] && /sbin/mdadm -IRs if [ -x /sbin/lvm ]; then action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit -- cgit v1.2.1 From 6fa9b81fe263f25c1395a6156d939433623a849f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 1 Mar 2011 17:35:52 +0200 Subject: Fix path to sysconfig.txt in comments. --- rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 7377f999..01cfed8c 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -73,7 +73,7 @@ if [ -z "${BOOTUP:-}" ]; then . /etc/sysconfig/init else # This all seem confusing? Look in /etc/sysconfig/init, - # or in /usr/doc/initscripts-*/sysconfig.txt + # or in /usr/share/doc/initscripts-*/sysconfig.txt BOOTUP=color RES_COL=60 MOVE_TO_COL="echo -en \\033[${RES_COL}G" -- cgit v1.2.1 From c9c14fb5cd56c831e5d1dca259a13d6797d1b773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 1 Mar 2011 17:34:05 +0200 Subject: Update and improve IPv6 disabling instructions. --- sysconfig.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sysconfig.txt b/sysconfig.txt index 7d03e0ed..21835e90 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -289,9 +289,12 @@ Generic options: NETWORKING_IPV6=yes|no Enable or disable global IPv6 initialization - To do this properly, add a rule in /etc/modprobe.conf that - disables loading of the ipv6 module. Example: - install ipv6 /bin/true + To do this properly, add a rule in /etc/modprobe.d that disables IPv6. + Note that the ipv6 module may be required by some other modules, for + example bonding, even when IPv6 is not in use so it is not recommended + to prevent loading it. Instead, use for example this in + /etc/modprobe.d/disable-ipv6.conf: + options ipv6 disable=1 /etc/sysconfig/static-routes-ipv6: Contains lines of the form: -- cgit v1.2.1 From 755c08720291006cfd8c16f3fb3c2c7987b8a944 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 3 Mar 2011 14:38:40 -0500 Subject: Initial transifex.net support, updated translations. --- .tx/config | 8 ++ po/eu_ES.po | 160 +++++++++++++------------ po/he.po | 170 ++++++++++++++------------- po/hy.po | 164 ++++++++++++++------------ po/ku.po | 169 ++++++++++++++------------- po/lo.po | 169 ++++++++++++++------------- po/my.po | 164 ++++++++++++++------------ po/si.po | 169 ++++++++++++++------------- po/sq.po | 171 +++++++++++++-------------- po/sv.po | 380 ++++++++++++++++++++++++++++++++---------------------------- po/ur.po | 169 ++++++++++++++------------- po/wa.po | 160 +++++++++++++------------ 12 files changed, 1077 insertions(+), 976 deletions(-) create mode 100644 .tx/config diff --git a/.tx/config b/.tx/config new file mode 100644 index 00000000..66d1abe2 --- /dev/null +++ b/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.net + +[fedora-initscripts.default] +file_filter = po/.po +source_file = po/initscripts.pot +source_lang = en + diff --git a/po/eu_ES.po b/po/eu_ES.po index 8a6826ce..be5f7762 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -1,13 +1,15 @@ +# msgid "" msgstr "" -"Project-Id-Version: \n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:19+0000\n" "Last-Translator: \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Language: eu_ES\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -52,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -278,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -293,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -332,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -420,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -441,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -531,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -610,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -751,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1166,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1200,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1226,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1349,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1605,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1688,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1819,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2040,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2154,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2205,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2239,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2325,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2638,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2707,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2729,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2756,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2839,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3099,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3194,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3220,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3451,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3585,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3796,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3806,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3925,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4285,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4453,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4699,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4735,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/he.po b/po/he.po index 62a3f66d..c509b0ab 100644 --- a/po/he.po +++ b/po/he.po @@ -1,19 +1,15 @@ -# Hebrew translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. -# +# msgid "" msgstr "" -"Project-Id-Version: initscript\n" -"PO-Revision-Date: 2004-09-27 11:28 TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"Last-Translator: \n" +"Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -58,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -284,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -299,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -338,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -426,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -447,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -537,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -616,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -757,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1172,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1206,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1232,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1355,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1611,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1694,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1825,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2046,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2160,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2211,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2245,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2331,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2644,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2713,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2735,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2762,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2845,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3105,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3200,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3226,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3457,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3591,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3802,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3812,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3931,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4291,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4459,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4705,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4741,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/hy.po b/po/hy.po index 9452b541..627c69fe 100644 --- a/po/hy.po +++ b/po/hy.po @@ -1,13 +1,15 @@ +# msgid "" msgstr "" -"Project-Id-Version: initscripts\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: hy\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -52,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -278,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -293,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -332,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -420,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -441,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -531,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -610,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -751,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1166,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1200,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1226,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1349,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1605,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1688,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1819,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2040,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2154,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2205,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2239,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2325,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2638,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2707,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2729,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2756,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2839,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3099,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3194,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3220,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3451,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3585,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3796,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3806,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3925,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4285,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4453,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4699,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4735,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/ku.po b/po/ku.po index d77b5023..bbe1d98a 100644 --- a/po/ku.po +++ b/po/ku.po @@ -1,18 +1,15 @@ -# Kurdish translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. -# +# msgid "" msgstr "" -"Project-Id-Version: initscript\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: ku\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -57,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -283,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -298,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -337,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -425,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -446,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -536,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -615,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -756,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1171,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1205,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1231,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1354,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1610,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1693,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1824,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2045,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2159,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2210,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2244,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2330,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2643,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2712,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2734,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2761,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2844,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3104,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3199,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3225,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3456,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3590,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3801,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3811,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3930,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4290,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4458,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4704,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4740,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/lo.po b/po/lo.po index 6e9dd149..24b6d3a7 100644 --- a/po/lo.po +++ b/po/lo.po @@ -1,18 +1,15 @@ -# Laotian translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. -# +# msgid "" msgstr "" -"Project-Id-Version: initscripts\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: lo\n" +"Plural-Forms: nplurals=1; plural=0\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -57,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -283,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -298,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -337,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -425,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -446,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -536,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -615,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -756,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1171,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1205,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1231,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1354,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1610,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1693,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1824,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2045,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2159,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2210,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2244,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2330,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2643,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2712,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2734,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2761,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2844,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3104,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3199,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3225,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3456,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3590,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3801,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3811,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3930,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4290,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4458,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4704,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4740,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/my.po b/po/my.po index 9452b541..120b8087 100644 --- a/po/my.po +++ b/po/my.po @@ -1,13 +1,15 @@ +# msgid "" msgstr "" -"Project-Id-Version: initscripts\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: my\n" +"Plural-Forms: nplurals=1; plural=0\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -52,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -278,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -293,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -332,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -420,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -441,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -531,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -610,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -751,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1166,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1200,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1226,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1349,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1605,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1688,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1819,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2040,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2154,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2205,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2239,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2325,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2638,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2707,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2729,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2756,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2839,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3099,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3194,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3220,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3451,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3585,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3796,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3806,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3925,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4285,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4453,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4699,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4735,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/si.po b/po/si.po index e0774349..59864e92 100644 --- a/po/si.po +++ b/po/si.po @@ -1,18 +1,15 @@ -# Sinhalese translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. -# +# msgid "" msgstr "" -"Project-Id-Version: initscript\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: si\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -57,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -283,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -298,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -337,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -425,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -446,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -536,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -615,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -756,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1171,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1205,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1231,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1354,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1610,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1693,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1824,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2045,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2159,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2210,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2244,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2330,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2643,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2712,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2734,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2761,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2844,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3104,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3199,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3225,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3456,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3590,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3801,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3811,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3930,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4290,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4458,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4704,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4740,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/sq.po b/po/sq.po index 1b4c02df..bdb076e7 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,20 +1,15 @@ -# Albanian translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. -# +# msgid "" msgstr "" -"Project-Id-Version: initscript\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: YYYY-MM-DD HH:MM TZ0 DST\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZ0 DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -59,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -285,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -300,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -339,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -427,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -448,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -538,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -617,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -758,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1173,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1207,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1233,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1356,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1612,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1695,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1826,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2047,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2161,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2212,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2246,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2332,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2645,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2714,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2736,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2763,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2846,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3106,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3201,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3227,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3458,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3592,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3803,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3813,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3932,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4292,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4460,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4706,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4742,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/sv.po b/po/sv.po index a4c30101..dd22dd46 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,26 +1,15 @@ -# Swedish messages for initscripts. -# Copyright © 2001-2010 Free Software Foundation, Inc. -# This file is distributed under the same license as the initscripts package. -# Magnus Larsson , 2007, 2009. -# Christian Rose , 2006. -# Göran Uddeborg , 2008-2010. -# -# Varning: Meddelanden bör inte vara längre än ungefär 60 tecken då -# de annars inte får plats. -# -# $Revision: 1.11 $ +# msgid "" msgstr "" -"Project-Id-Version: initscripts\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: (null)\n" -"PO-Revision-Date: 2010-08-27 22:16+0200\n" -"Last-Translator: Göran Uddeborg \n" -"Language-Team: Swedish \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-01 19:51+0000\n" +"Last-Translator: goeran \n" +"Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" "Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -39,7 +28,6 @@ msgstr "redan stoppad" msgid "Starting Shorewall: " msgstr "Startar Shorewall: " -# Om "slave" ska översättas tycker jag att även "master" ska översättas #: /etc/rc.d/init.d/ups:60 msgid "Starting UPS monitor (slave): " msgstr "Startar UPS-övervakaren (slave): " @@ -68,7 +56,8 @@ msgstr "$base är död men pid-fil finns" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "$alias-enheten ${DEVICE} verkar inte finnas, fördröjer initiering." #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -294,7 +283,8 @@ msgstr "Sparar $desc ($prog): " msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "IPv4-fjärradress för tunnel saknas, konfigurationen är inte giltig" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "uppstart av $prog" @@ -309,16 +299,15 @@ msgstr "Avaktiverar denyhosts cron-tjänst: " #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" "Användning: $spooler {start|stop|status|reload|restart|condrestart|force-" "reload|try-restart}" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 msgid "Unsupported mechanism '$mechanism' for sending trigger to radvd" -msgstr "" -"Mekanismen \"$mechanism\" stöds inte vid skickande av trigger till radvd" +msgstr "Mekanismen \"$mechanism\" stöds inte vid skickande av trigger till radvd" #: /etc/ppp/ip-up.ipv6to4:189 /etc/sysconfig/network-scripts/ifup-ipv6:299 msgid "radvd control enabled, but config is not complete" @@ -336,7 +325,9 @@ msgstr "Stoppar systemmeddelandebuss: " msgid "" "Usage: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-" "restart}" -msgstr "Användning: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-restart}" +msgstr "" +"Användning: $0 {start|stop|restart|reload|force-reload|status|condrestart" +"|try-restart}" #: /etc/rc.d/init.d/bgpd:35 /etc/rc.d/init.d/ospf6d:34 #: /etc/rc.d/init.d/ospfd:34 /etc/rc.d/init.d/radvd:44 @@ -351,8 +342,8 @@ msgstr "Avaktiverar nattlig yum-uppdatering: " #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" "Användning: $0 {start|stop|status|restart|force-reload|condrestart|try-" "restart|reload}" @@ -370,22 +361,20 @@ msgid "" "Usage: $0 {start|stop|status|restart|force-reload|reload|condrestart|try-" "restart}" msgstr "" -"Användning: $0 {start|stop|status|restart|force-reload|reload|condrestart|" -"try-restart}" +"Användning: $0 {start|stop|status|restart|force-reload|reload|condrestart" +"|try-restart}" #: /etc/rc.d/init.d/nginx:131 msgid "" "Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}" msgstr "" -"Användning: $0 {start|stop|reload|configtest|status|force-reload|upgrade|" -"restart}" +"Användning: $0 {start|stop|reload|configtest|status|force-" +"reload|upgrade|restart}" #: /etc/rc.d/init.d/smolt:22 msgid "Enabling monthly Smolt checkin: " msgstr "Aktiverar månatlig Smolt-incheckning: " -# "användardefinierade" får inte plats på en del ställen, därför -# används "egendefinierade". #: /etc/rc.d/init.d/arptables_jf:117 msgid "Removing user defined chains:" msgstr "Tar bort egendefinierade kedjor:" @@ -436,8 +425,8 @@ msgid "" "Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-" "reload|report}" msgstr "" -"Användning: $0 {start|stop|restart|status|condrestart|try-restart|reload|" -"force-reload|report}" +"Användning: $0 {start|stop|restart|status|condrestart|try-restart|reload" +"|force-reload|report}" #: /etc/rc.d/init.d/icecast:53 msgid "Reloading icecast: " @@ -449,16 +438,16 @@ msgstr "Stänger av openvpn: " #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" -"Användning: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Användning: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" "Användning: $monitor {start|stop|status|reload|restart|condrestart|force-" "reload|try-restart}" @@ -474,8 +463,8 @@ msgstr "Stänger av $desc ($prog): " #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" "Användning: $dagent {start|stop|status|reload|restart|condrestart|force-" "reload|try-restart}" @@ -566,9 +555,11 @@ msgstr "Användning: $0 {start|stop|restart|status|condrestart}" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" -msgstr "Användning: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" +msgstr "" +"Användning: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" #: /etc/rc.d/init.d/smokeping:33 msgid "Starting smokeping: " @@ -645,9 +636,11 @@ msgstr "Stänger av NFS-demonen: " #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" -msgstr "Användning: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" +msgstr "" +"Användning: $prog {start|stop|restart|restartlog|condrestart|try-" +"restart|reload|force-reload|status}" #: /etc/rc.d/init.d/ctdb:280 msgid "ctdb is stopped" @@ -786,8 +779,8 @@ msgstr "Startar processbokföring: " #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" "Användning: $server {start|stop|status|reload|restart|condrestart|force-" "reload|try-restart}" @@ -823,8 +816,8 @@ msgid "" "Warning: ipppd (kernel 2.4.x and below) doesn't support IPv6 using " "encapsulation 'syncppp'" msgstr "" -"Varning: ipppd (2.4.x-kärnor och därunder) stöder inte IPv6 med inkapslingen " -"\"syncppp\"" +"Varning: ipppd (2.4.x-kärnor och därunder) stöder inte IPv6 med inkapslingen" +" \"syncppp\"" #: /etc/rc.d/init.d/gpm:58 msgid "(no mouse is configured)" @@ -844,7 +837,7 @@ msgstr "Applicerar sysctl-inställningar från $SYSCTL_POST" #: /etc/rc.d/init.d/pgpool:134 msgid "Sending switchover request to $NAME " -msgstr "Skickar förfrågan att byta över till $NAME " +msgstr "Skickar bytesbegäran till $NAME" #: /etc/rc.d/init.d/gkrellmd:70 /etc/rc.d/init.d/hddtemp:86 #: /etc/rc.d/init.d/vdr:96 @@ -998,8 +991,8 @@ msgid "" "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-" "reload|cyclelogs|online|offline|command}" msgstr "" -"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload|" -"force-reload|cyclelogs|online|offline|command}" +"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload|cyclelogs|online|offline|command}" #: /etc/rc.d/init.d/netconsole:101 msgid "Disabling netconsole" @@ -1138,7 +1131,9 @@ msgstr "sfcb kör inte" #: /etc/rc.d/init.d/arptables_jf:192 msgid "" "Usage: $0 {start|stop|restart|try-restart|force-reload|status|panic|save}" -msgstr "Användning: $0 {start|stop|restart|try-restart|force-reload|status|panic|save}" +msgstr "" +"Användning: $0 {start|stop|restart|try-restart|force-" +"reload|status|panic|save}" #: /etc/rc.d/init.d/ctdb:172 msgid "CTDB is already running" @@ -1211,9 +1206,11 @@ msgstr "Stänger av $LLDPAD: " #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" -msgstr "Användning: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" +msgstr "" +"Användning: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" #: /etc/rc.d/init.d/netfs:40 msgid "Mounting NFS filesystems: " @@ -1227,7 +1224,8 @@ msgstr "Startar NetworkManager-demonen: " msgid "" "Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}" msgstr "" -"Användning: $PROG {start|stop|restart|reload|force-reload|try-restart|status}" +"Användning: $PROG {start|stop|restart|reload|force-reload|try-" +"restart|status}" #: /etc/rc.d/init.d/fb-server:42 msgid "Stopping Frozen Bubble server(s): " @@ -1248,11 +1246,11 @@ msgstr "ctdb är död men undersystemet låst" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" -"Användning: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"once|genconfig}" +"Användning: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 msgid "Error occurred while calculating the IPv6to4 prefix" @@ -1266,7 +1264,9 @@ msgstr "Sparar nuvarande regler till $ARPTABLES_CONFIG" msgid "" "Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-" "restart}" -msgstr "Användning: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}" +msgstr "" +"Användning: $0 {start|stop|status|restart|condrestart|reload|force-reload" +"|try-restart}" #: /etc/rc.d/init.d/firehol:5604 /etc/rc.d/init.d/firehol:5627 msgid "FireHOL: Blocking all communications:" @@ -1276,7 +1276,7 @@ msgstr "FireHOL: Blockerar all kommunikation:" msgid "Restarting $monitor: " msgstr "Startar om $monitor: " -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "$named omläsning" @@ -1401,7 +1401,8 @@ msgstr "Återupptar gäster på $uri URI…" msgid "Starting xenconsoled daemon: " msgstr "Startar xenconsoled-demon: " -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "uppstart av $base" @@ -1633,8 +1634,8 @@ msgid "" "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-" "reload}" msgstr "" -"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload|" -"force-reload}" +"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" #: /etc/rc.d/init.d/smokeping:40 msgid "Stopping smokeping: " @@ -1660,9 +1661,11 @@ msgstr "Användning: $0 {start|stop|reload|restart|showsysctl}" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" -msgstr "Användning: $indexer {start|stop|status|reload|restart|condrestart|force-reload|try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" +msgstr "" +"Användning: $indexer {start|stop|status|reload|restart|condrestart|force-" +"reload|try-restart}" #: /etc/rc.d/init.d/ushare:76 msgid "Usage: $prog {start|stop|restart|condrestart|reload|status" @@ -1745,10 +1748,11 @@ msgstr "Startar openvpn: " #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" -"Användning: $prog {start|stop|restart|force-reload|condrestart|try-restart|" -"status}" +"Användning: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 msgid "Reloading ${prog}: " @@ -1800,7 +1804,8 @@ msgstr "$0: /etc/sysconfig/ktune finns inte." #: /etc/sysconfig/network-scripts/ifup-aliases:187 msgid "error in $FILE: already seen device $parent_device:$DEVNUM in $devseen" -msgstr "fel i $FILE: enheten $parent_device:$DEVNUM har redan setts i $devseen" +msgstr "" +"fel i $FILE: enheten $parent_device:$DEVNUM har redan setts i $devseen" #: /etc/init/splash-manager.conf:14 msgid "Restarting..." @@ -1834,7 +1839,6 @@ msgstr "Stänger av BitTorrent-fröklienten: " msgid "Reloading xend daemon: " msgstr "Läser om xend-demon: " -# Osäker #: /etc/rc.d/init.d/halt:53 /etc/rc.d/init.d/reboot:53 msgid "Halting system..." msgstr "Stoppar systemet..." @@ -1880,8 +1884,8 @@ msgstr "kontroll av $prog" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" "Användning: $0 {start|stop|restart|try-restart|condrestart|reload|force-" "reload|status}" @@ -1989,8 +1993,8 @@ msgid "" "Given remote address '$addressipv4tunnel' on tunnel device '$device' is " "already configured on device '$devnew'" msgstr "" -"Angivna fjärradressen \"$addressipv4tunnel\" på tunnlingsenheten \"$device\" " -"är redan konfigurerad på enheten \"$devnew\"" +"Angivna fjärradressen \"$addressipv4tunnel\" på tunnlingsenheten \"$device\"" +" är redan konfigurerad på enheten \"$devnew\"" #: /etc/rc.d/init.d/iceccd:32 msgid "Starting distributed compiler daemon: " @@ -2027,8 +2031,8 @@ msgid "" "Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and " "restart (IPv6) networking" msgstr "" -"Enheten \"$DEVICE\" stöds inte här, använd inställningen IPV6_AUTOTUNNEL och " -"starta om (IPv6-)nätverksanslutningen" +"Enheten \"$DEVICE\" stöds inte här, använd inställningen IPV6_AUTOTUNNEL och" +" starta om (IPv6-)nätverksanslutningen" #: /etc/rc.d/init.d/yum-cron:22 msgid "Enabling nightly yum update: " @@ -2110,8 +2114,8 @@ msgstr "Stoppar xenstored-demon: " #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" "Användning: $0 {start|stop|restart|condrestart|try-restart|reload|force-" "reload|status}" @@ -2129,8 +2133,8 @@ msgid "" "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-" "reload|rotate|resume}" msgstr "" -"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload|" -"force-reload|rotate|resume}" +"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload|rotate|resume}" #: /etc/rc.d/init.d/tinyerp-server:86 msgid "$prog is running..." @@ -2228,8 +2232,8 @@ msgstr "VNC-server" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" "Användning: $0 {start|stop|restart|reload|force-reload|condrestart|try-" "restart|status}" @@ -2266,8 +2270,8 @@ msgstr "*** Varning -- SELinux ${SELINUXTYPE} policy ommärkning krävs. " msgid "" "$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log" msgstr "" -"$prog-fel vid import av databaser, kontrollera ${CONFIGDIRECTORY}/rpm/" -"db_import.log" +"$prog-fel vid import av databaser, kontrollera " +"${CONFIGDIRECTORY}/rpm/db_import.log" #: /etc/rc.d/init.d/orbited:20 msgid "Starting Orbited: " @@ -2283,9 +2287,11 @@ msgstr "Stänger av pand: " #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" -msgstr "Användning: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" +msgstr "" +"Användning: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 msgid "Usage: $prog {start|stop|status|restart|condrestart}" @@ -2317,9 +2323,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "Stoppar distribuerad kompileringsschemaläggare: " #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "nerstängning av $base" @@ -2403,11 +2410,11 @@ msgstr "Användning: $0 {start|stop|restart}" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" -"Användning: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Användning: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" #: /etc/rc.d/init.d/util-vserver:112 msgid "Unmounting cgroup-hierarchy" @@ -2479,8 +2486,8 @@ msgid "" "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-" "stop|force-restart|force-reload}" msgstr "" -"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload|" -"force-stop|force-restart|force-reload}" +"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload" +"|force-stop|force-restart|force-reload}" #: /etc/rc.d/init.d/tog-pegasus:90 msgid "Shutting down CIM server: " @@ -2520,7 +2527,9 @@ msgstr "Startar pdns-recursor: " msgid "" "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-" "reload|initdb}" -msgstr "Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb}" +msgstr "" +"Användning: $0 {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload|initdb}" #: /etc/rc.d/init.d/bgpd:69 /etc/rc.d/init.d/ripd:68 #: /etc/rc.d/init.d/ripngd:68 /etc/rc.d/init.d/zebra:68 @@ -2605,7 +2614,6 @@ msgstr "$s är stoppad" msgid "Stopping Video Disk Recorder ($prog): " msgstr "Stoppar Video Disk Recorder ($prog): " -# Går detta att översätta? #: /etc/rc.d/init.d/functions:552 msgid "Start service $1 (Y)es/(N)o/(C)ontinue? [Y] " msgstr "Starta tjänsten $1 (J)a/(N)ej/(F)ortsätt? [J] " @@ -2632,7 +2640,8 @@ msgstr "Initierar netconsole" #: /etc/rc.d/init.d/functions:277 msgid "Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" -msgstr "Användning: killproc [-p pidfil] [ -d fördröjning] {program} [-signal]" +msgstr "" +"Användning: killproc [-p pidfil] [ -d fördröjning] {program} [-signal]" #: /etc/rc.d/init.d/nfs:130 msgid "Shutting down NFS mountd: " @@ -2724,7 +2733,8 @@ msgstr "Aktiva CIFS-monteringspunkter: " msgid "DSS key generation" msgstr "DSS-nyckelgenerering" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "$prog stängs ner" @@ -2793,8 +2803,8 @@ msgstr "Startar om $dagent: " #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" "Användning: $gateway {start|stop|status|reload|restart|condrestart|force-" "reload|try-restart}" @@ -2817,11 +2827,11 @@ msgstr "Stoppar xend-demon: " #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" -"Användning: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Användning: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" #: /etc/rc.d/init.d/systemtap:580 msgid "$s is dead, but another script is running." @@ -2846,11 +2856,11 @@ msgstr "Konfigurerade NCP-monteringspunkter: " #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" -"Användning: $0 {start|stop|restart|reload|force-reload|status|cron|" -"condrestart|try-restart}" +"Användning: $0 {start|stop|restart|reload|force-" +"reload|status|cron|condrestart|try-restart}" #: /etc/rc.d/init.d/puppetmaster:90 msgid "Generate configuration puppetmaster: " @@ -2923,7 +2933,9 @@ msgstr "" msgid "" "Usage: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-" "reload}" -msgstr "Användning: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-reload}" +msgstr "" +"Användning: $0 {start|stop|status|restart|try-restart|condrestart|reload" +"|force-reload}" #: /etc/rc.d/init.d/denyhosts:93 msgid "Denyhosts already running." @@ -2934,9 +2946,9 @@ msgid "Stoping Gadget daemon: " msgstr "Stoppar Gadget-demonen: " #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" -msgstr "" -"Varning: gränssnittet \"tun6to4\" stöder inte \"IPV6_DEFAULTGW\", ignorerar" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgstr "Varning: gränssnittet \"tun6to4\" stöder inte \"IPV6_DEFAULTGW\", ignorerar" #: /etc/sysconfig/network-scripts/ifup-eth:76 #: /etc/sysconfig/network-scripts/ifup-ib:54 @@ -3056,8 +3068,8 @@ msgid "" "Usage: $prog {start|stop|status|reload|restart|condrestart|force-reload|try-" "restart} []" msgstr "" -"Användning: $prog {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart} []" +"Användning: $prog {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart} []" #: /etc/rc.d/init.d/gnokii-smsd:45 msgid "Stopping Gnokii SMS daemon ($prog): " @@ -3197,7 +3209,7 @@ msgstr "Startar $prog: $conf, $INTERFACES, $DRIVERS" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "Stoppar demonen för övervakning av hårddisktemperatur ($prog): " -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "uppstart av irattach" @@ -3294,8 +3306,8 @@ msgstr "Konfigurerade nätverksblockenheter:" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" "Användning: $0 {condrestart|try-restart|start|stop|restart|reload|force-" "reload|status}" @@ -3322,9 +3334,11 @@ msgstr "Användning: $0 {start|stop|restart|try-restart|status|force-reload}" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" -msgstr "Användning: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" +msgstr "" +"Användning: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|status}" #: /etc/rc.d/init.d/restorecond:85 msgid "Usage: $0 {start|stop|restart|force-reload|status|condrestart}" @@ -3342,7 +3356,9 @@ msgstr "Avmonterar rörfilsystem (återförsök): " #: /etc/rc.d/init.d/qpidd:114 msgid "" "Usage: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}" -msgstr "Användning: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}" +msgstr "" +"Användning: $0 {start|stop|status|restart|condrestart|try-restart|force-" +"reload}" #: /etc/rc.d/init.d/cyrus-imapd:115 msgid "Reloading cyrus.conf file: " @@ -3396,8 +3412,8 @@ msgstr "Orbited kör inte." msgid "" "Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}" msgstr "" -"Användning: $0 {start|stop|restart|reload|abort|flush|check|status|" -"condrestart}" +"Användning: $0 " +"{start|stop|restart|reload|abort|flush|check|status|condrestart}" #: /etc/rc.d/init.d/udev-post:32 msgid "Adding udev persistent rules" @@ -3461,8 +3477,8 @@ msgid "" "Usage: $ical {start|stop|status|reload|restart|condrestart|force-reload|try-" "restart}" msgstr "" -"Användning: $ical {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Användning: $ical {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" #: /etc/rc.d/init.d/amavisd:60 msgid "Reloading ${prog_base}:" @@ -3522,8 +3538,8 @@ msgstr "Startar spelserver liquidwar: " msgid "" "$prog error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log" msgstr "" -"$prog-fel vid export av databaser, kontrollera ${CONFIGDIRECTORY}/rpm/" -"db_export.log" +"$prog-fel vid export av databaser, kontrollera " +"${CONFIGDIRECTORY}/rpm/db_export.log" #: /etc/rc.d/init.d/and:44 msgid "Shutting down auto nice daemon:" @@ -3541,7 +3557,9 @@ msgstr "Genererar RSA-värdnyckel för dropbear: " msgid "" "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-" "restart}" -msgstr "Användning: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-restart}" +msgstr "" +"Användning: $0 {start|stop|status|restart|reload|force-reload|condrestart" +"|try-restart}" #: /etc/rc.d/init.d/crond:82 /etc/rc.d/init.d/sshd:166 msgid "Reloading $prog" @@ -3559,8 +3577,9 @@ msgstr "Stoppar $desc ($prog): " msgid "Sending all processes the KILL signal..." msgstr "Skickar signalen KILL till alla processer..." -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "$base $killlevel" @@ -3651,7 +3670,6 @@ msgstr "$file ägs inte av \"$user\"" msgid "Starting $prog for $site: " msgstr "Startar $prog för $site: " -# Detta borde buggrapporteras... #: /etc/rc.d/init.d/flumotion:73 msgid "Starting $type $name: " msgstr "Startar $type $name: " @@ -3695,11 +3713,11 @@ msgstr "DSA-nyckelgenerering" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" -"Användning: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Användning: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" #: /etc/rc.d/init.d/blktapctrl:39 msgid "Starting xen blktapctrl daemon: " @@ -3772,7 +3790,8 @@ msgstr "Användning: $0 {start|stop|reload}" #: /etc/rc.d/init.d/condor:58 msgid "Warning: $prog may not have exited, start/restart may fail" -msgstr "Varning: $prog kanske inte har avslutats, start/omstart kan misslyckas" +msgstr "" +"Varning: $prog kanske inte har avslutats, start/omstart kan misslyckas" #: /etc/rc.d/init.d/clement:189 /etc/rc.d/init.d/clement:192 msgid "clement stop" @@ -3784,7 +3803,8 @@ msgstr "Genererar DSA-värdnyckel för SSH2: " #: /etc/sysconfig/network-scripts/ifup:93 msgid "No 802.1Q VLAN support available in kernel for device ${DEVICE}" -msgstr "Inget stöd för 802.1Q-VLAN tillgängligt i kärnan för enheten ${DEVICE}" +msgstr "" +"Inget stöd för 802.1Q-VLAN tillgängligt i kärnan för enheten ${DEVICE}" #: /etc/rc.d/init.d/tetrinetx:43 msgid "Stopping $display_name: " @@ -3909,21 +3929,24 @@ msgstr "Användning: $0 {start|stop|force-reload|restart|try-restart|status}" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" -msgstr "Användning: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" +msgstr "" +"Användning: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" #: /etc/rc.d/init.d/systemtap:61 msgid "Usage: $prog {start|stop|restart|status|compile|cleanup} [option]" -msgstr "Användning: $prog {start|stop|restart|status|compile|cleanup} [option]" +msgstr "" +"Användning: $prog {start|stop|restart|status|compile|cleanup} [option]" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" -"Användning: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Användning: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 #: /etc/rc.d/rc.sysinit:432 @@ -4044,11 +4067,11 @@ msgstr "Startar NFS-tjänster: " #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" -"Användning: $0 {start|stop|status|restart|condrestart|stats|notify|reload|" -"rebuild|running|update}" +"Användning: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" #: /etc/rc.d/init.d/xpilot-ng-server:57 msgid "Stopping Xpilot game server: " @@ -4135,8 +4158,8 @@ msgstr "${SERVICE}: okänd tjänst" msgid "" "Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}" msgstr "" -"Användning: $0 {start|stop|status|reload|force-reload|restart|try-restart|" -"probe}" +"Användning: $0 {start|stop|status|reload|force-reload|restart|try-" +"restart|probe}" #: /etc/rc.d/init.d/sblim-sfcb:74 msgid "sfcb is not running, but lock file exists" @@ -4272,7 +4295,9 @@ msgstr "Väntar på anslutnings- och frånkopplings-händelser för läsaren..." msgid "" "Usage: $0 {start|stop|status|reload|restart|condrestart|force-reload|try-" "restart}" -msgstr "Användning: $0 {start|stop|status|reload|restart|condrestart|force-reload|try-restart}" +msgstr "" +"Användning: $0 {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" #: /etc/rc.d/init.d/netfs:43 msgid "Mounting NCP filesystems: " @@ -4413,8 +4438,8 @@ msgstr "initierare fortfarande anslutna" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" "Användning: $0 {start|stop|restart|condrestart|try-restart|reload|force-" "reload|status|dump}" @@ -4461,7 +4486,8 @@ msgstr "Startar $master_prog: " #: /etc/rc.d/init.d/libvirt-guests:129 msgid "libvirt-guests is configured not to start any guests on boot" -msgstr "libvirt-guests är konfigurerad att inte startna några gäster vid uppstart" +msgstr "" +"libvirt-guests är konfigurerad att inte startna några gäster vid uppstart" #: /etc/rc.d/init.d/innd:59 /etc/rc.d/init.d/innd:61 msgid "innd shutdown" @@ -4584,8 +4610,8 @@ msgstr "återinläsning inte implementerad" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" "Angivna IPv6-standardgatewayen \"$address\" är lokal för länken, men ingen " "omfattning eller gatewayenhet är angiven" @@ -4611,8 +4637,8 @@ msgid "" "Global IPv6 forwarding is disabled in configuration, but not currently " "disabled in kernel" msgstr "" -"Global IPv6-vidarebefordran är avaktiverad i denna konfiguration, men är för " -"tillfället inte avaktiverad i kärnan" +"Global IPv6-vidarebefordran är avaktiverad i denna konfiguration, men är för" +" tillfället inte avaktiverad i kärnan" #: /etc/rc.d/init.d/condor:173 msgid "$0: error: insufficient privileges" @@ -4643,9 +4669,9 @@ msgid "" "Given IPv6 default gateway '$address' has scope '$device_scope' defined, " "given default gateway device '$device' will be not used" msgstr "" -"Angivna IPv6-standardgatewayen \"$address\" har omfattningen \"$device_scope" -"\" angiven, angivna standardgatewayenheten \"$device\" kommer inte att " -"användas" +"Angivna IPv6-standardgatewayen \"$address\" har omfattningen " +"\"$device_scope\" angiven, angivna standardgatewayenheten \"$device\" kommer" +" inte att användas" #: /etc/rc.d/init.d/ksm:61 msgid "$prog not supported" @@ -4843,9 +4869,9 @@ msgstr "Läser om smokeping: " msgid "httpd shutdown" msgstr "avstängning av httpd" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "$STRING" @@ -4879,8 +4905,8 @@ msgstr "Läser om regelkonfiguration: " #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" "Användning: $0 {start|stop|restart|reload|force-reload|condrestart|try-" "restart|status|quickstart|quickstop}" diff --git a/po/ur.po b/po/ur.po index befd277f..4eb688a7 100644 --- a/po/ur.po +++ b/po/ur.po @@ -1,18 +1,15 @@ -# Urdu translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. -# +# msgid "" msgstr "" -"Project-Id-Version: initscript\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"Last-Translator: \n" +"Language-Team: Urdu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: ur\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -57,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -283,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -298,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -337,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -425,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -446,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -536,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -615,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -756,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1171,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1205,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1231,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1354,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1610,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1693,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1824,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2045,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2159,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2210,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2244,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2330,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2643,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2712,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2734,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2761,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2844,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3104,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3199,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3225,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3456,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3590,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3801,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3811,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3930,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4290,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4458,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4704,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4740,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 diff --git a/po/wa.po b/po/wa.po index 8a6826ce..6ea3b26b 100644 --- a/po/wa.po +++ b/po/wa.po @@ -1,13 +1,15 @@ +# msgid "" msgstr "" -"Project-Id-Version: \n" -"PO-Revision-Date: YYYY-MM-DD HH:MM TZO DST\n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-03 19:18+0000\n" "Last-Translator: \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Language: wa\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" #: /etc/rc.d/init.d/ez-ipupdate:76 msgid "Reloading $prog for $ez_name: " @@ -52,7 +54,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:74 #: /etc/sysconfig/network-scripts/ifup-ib:52 msgid "" -"$alias device ${DEVICE} does not seem to be present, delaying initialization." +"$alias device ${DEVICE} does not seem to be present, delaying " +"initialization." msgstr "" #: /etc/rc.d/init.d/btseed:70 /etc/rc.d/init.d/bttrack:71 @@ -278,7 +281,8 @@ msgstr "" msgid "Missing remote IPv4 address of tunnel, configuration is not valid" msgstr "" -#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/oscap-scan:62 +#: /etc/rc.d/init.d/ksm:47 /etc/rc.d/init.d/ksm:47 +#: /etc/rc.d/init.d/oscap-scan:62 /etc/rc.d/init.d/oscap-scan:62 #: /etc/rc.d/init.d/systemtap:518 msgid "$prog startup" msgstr "" @@ -293,8 +297,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-spooler:110 msgid "" -"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $spooler {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1146 @@ -332,8 +336,8 @@ msgstr "" #: /etc/rc.d/init.d/rhnsd:108 msgid "" -"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-restart|" -"reload}" +"Usage: $0 {start|stop|status|restart|force-reload|condrestart|try-" +"restart|reload}" msgstr "" #: /etc/rc.d/init.d/firstboot:52 @@ -420,14 +424,14 @@ msgstr "" #: /etc/rc.d/init.d/puppetmaster:133 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|genconfig}" msgstr "" #: /etc/rc.d/init.d/zarafa-monitor:110 msgid "" -"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $monitor {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/rc.sysinit:89 @@ -441,8 +445,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-dagent:115 msgid "" -"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $dagent {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/rsyslog:50 /etc/rc.d/init.d/sysklogd:54 @@ -531,8 +535,8 @@ msgstr "" #: /etc/rc.d/init.d/httpd:119 msgid "" -"Usage: $prog {start|stop|restart|condrestart|try-restart|force-reload|reload|" -"status|fullstatus|graceful|help|configtest}" +"Usage: $prog {start|stop|restart|condrestart|try-restart|force-" +"reload|reload|status|fullstatus|graceful|help|configtest}" msgstr "" #: /etc/rc.d/init.d/smokeping:33 @@ -610,8 +614,8 @@ msgstr "" #: /etc/rc.d/init.d/cups:140 msgid "" -"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload|" -"force-reload|status}" +"Usage: $prog {start|stop|restart|restartlog|condrestart|try-restart|reload" +"|force-reload|status}" msgstr "" #: /etc/rc.d/init.d/ctdb:280 @@ -751,8 +755,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-server:144 msgid "" -"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $server {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ypxfrd:32 @@ -1166,8 +1170,8 @@ msgstr "" #: /etc/rc.d/init.d/ksmtuned:84 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"retune|help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|retune|help}" msgstr "" #: /etc/rc.d/init.d/netfs:40 @@ -1200,8 +1204,8 @@ msgstr "" #: /etc/rc.d/init.d/puppet:112 msgid "" -"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|" -"genconfig}" +"Usage: $0 {start|stop|status|restart|reload|force-" +"reload|condrestart|once|genconfig}" msgstr "" #: /etc/sysconfig/network-scripts/ifup-ipv6:296 @@ -1226,7 +1230,7 @@ msgstr "" msgid "Restarting $monitor: " msgstr "" -#: /etc/rc.d/init.d/named:234 +#: /etc/rc.d/init.d/named:234 /etc/rc.d/init.d/named:234 msgid "$named reload" msgstr "" @@ -1349,7 +1353,8 @@ msgstr "" msgid "Starting xenconsoled daemon: " msgstr "" -#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/greylistd:28 +#: /etc/rc.d/init.d/functions:267 /etc/rc.d/init.d/functions:267 +#: /etc/rc.d/init.d/greylistd:28 /etc/rc.d/init.d/greylistd:28 msgid "$base startup" msgstr "" @@ -1605,8 +1610,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-indexer:108 msgid "" -"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $indexer {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/ushare:76 @@ -1688,7 +1693,8 @@ msgstr "" #: /etc/rc.d/init.d/mailman:168 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/pki-rad:959 /etc/rc.d/init.d/pki-tpsd:983 @@ -1819,8 +1825,8 @@ msgstr "" #: /etc/rc.d/init.d/dictd:94 msgid "" -"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|try-restart|condrestart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/tclhttpd:37 @@ -2040,8 +2046,8 @@ msgstr "" #: /etc/rc.d/init.d/oddjobd:102 /etc/rc.d/init.d/pyicq-t:92 #: /etc/rc.d/init.d/rsyslog:102 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/smartd:88 @@ -2154,8 +2160,8 @@ msgstr "" #: /etc/rc.d/init.d/sshd:233 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status}" msgstr "" #: /etc/rc.d/init.d/systemtap:62 @@ -2205,8 +2211,8 @@ msgstr "" #: /etc/rc.d/init.d/ksm:98 msgid "" -"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|" -"help}" +"Usage: $prog {start|stop|restart|force-reload|condrestart|try-" +"restart|status|help}" msgstr "" #: /etc/rc.d/init.d/ajaxterm:71 /etc/rc.d/init.d/qemu:98 @@ -2239,9 +2245,10 @@ msgid "Stopping distributed compiler scheduler: " msgstr "" #: /etc/rc.d/init.d/functions:303 /etc/rc.d/init.d/functions:324 -#: /etc/rc.d/init.d/functions:340 /etc/rc.d/init.d/tclhttpd:116 +#: /etc/rc.d/init.d/functions:324 /etc/rc.d/init.d/functions:340 +#: /etc/rc.d/init.d/tclhttpd:116 /etc/rc.d/init.d/tclhttpd:116 #: /etc/rc.d/init.d/tclhttpd:127 /etc/rc.d/init.d/voms:259 -#: /etc/rc.d/init.d/voms:270 +#: /etc/rc.d/init.d/voms:259 /etc/rc.d/init.d/voms:270 msgid "$base shutdown" msgstr "" @@ -2325,8 +2332,8 @@ msgstr "" #: /etc/rc.d/init.d/dhcpd:112 /etc/rc.d/init.d/dhcpd6:115 #: /etc/rc.d/init.d/dhcrelay:83 msgid "" -"Usage: $0 {start|stop|restart|force-reload|condrestart|try-restart|" -"configtest|status}" +"Usage: $0 {start|stop|restart|force-reload|condrestart|try-" +"restart|configtest|status}" msgstr "" #: /etc/rc.d/init.d/util-vserver:112 @@ -2638,7 +2645,8 @@ msgstr "" msgid "DSS key generation" msgstr "" -#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 /etc/rc.d/init.d/nscd:61 +#: /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/ksm:55 /etc/rc.d/init.d/nscd:59 +#: /etc/rc.d/init.d/nscd:61 msgid "$prog shutdown" msgstr "" @@ -2707,8 +2715,8 @@ msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:110 msgid "" -"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart}" +"Usage: $gateway {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/zarafa-gateway:62 @@ -2729,8 +2737,8 @@ msgstr "" #: /etc/rc.d/init.d/pgpool:200 msgid "" -"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|" -"force-reload}" +"Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:580 @@ -2756,8 +2764,8 @@ msgstr "" #: /etc/rc.d/init.d/ctdb:313 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|" -"try-restart}" +"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart" +"|try-restart}" msgstr "" #: /etc/rc.d/init.d/puppetmaster:90 @@ -2839,7 +2847,8 @@ msgid "Stoping Gadget daemon: " msgstr "" #: /etc/ppp/ip-up.ipv6to4:138 /etc/sysconfig/network-scripts/ifup-ipv6:247 -msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" +msgid "" +"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" msgstr "" #: /etc/sysconfig/network-scripts/ifup-eth:76 @@ -3099,7 +3108,7 @@ msgstr "" msgid "Stopping hard disk temperature monitor daemon ($prog): " msgstr "" -#: /etc/rc.d/init.d/irda:28 +#: /etc/rc.d/init.d/irda:28 /etc/rc.d/init.d/irda:28 msgid "irattach startup" msgstr "" @@ -3194,8 +3203,8 @@ msgstr "" #: /etc/rc.d/init.d/dovecot:102 msgid "" -"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|" -"status}" +"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-" +"reload|status}" msgstr "" #: /etc/rc.d/init.d/cfenvd:27 @@ -3220,8 +3229,8 @@ msgstr "" #: /etc/rc.d/init.d/slapd:264 /etc/rc.d/init.d/slapd:268 msgid "" -"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|" -"configtest|usage}" +"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-" +"restart|configtest|usage}" msgstr "" #: /etc/rc.d/init.d/restorecond:85 @@ -3451,8 +3460,9 @@ msgstr "" msgid "Sending all processes the KILL signal..." msgstr "" -#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/tclhttpd:123 -#: /etc/rc.d/init.d/voms:266 +#: /etc/rc.d/init.d/functions:331 /etc/rc.d/init.d/functions:331 +#: /etc/rc.d/init.d/tclhttpd:123 /etc/rc.d/init.d/tclhttpd:123 +#: /etc/rc.d/init.d/voms:266 /etc/rc.d/init.d/voms:266 msgid "$base $killlevel" msgstr "" @@ -3585,8 +3595,8 @@ msgstr "" #: /etc/rc.d/init.d/pgbouncer:162 msgid "" -"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|" -"condrestart|condstop}" +"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-" +"reload|condrestart|condstop}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:39 @@ -3796,8 +3806,8 @@ msgstr "" #: /etc/rc.d/init.d/mip6d:108 msgid "" -"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-" -"reload}" +"Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload" +"|force-reload}" msgstr "" #: /etc/rc.d/init.d/systemtap:61 @@ -3806,8 +3816,8 @@ msgstr "" #: /etc/rc.d/init.d/autofs:192 msgid "" -"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|" -"condrestart}" +"Usage: $0 " +"{start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" msgstr "" #: /etc/rc.d/init.d/netfs:90 /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit:232 @@ -3925,8 +3935,8 @@ msgstr "" #: /etc/rc.d/init.d/nsd:106 msgid "" -"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|" -"running|update}" +"Usage: $0 " +"{start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}" msgstr "" #: /etc/rc.d/init.d/xpilot-ng-server:57 @@ -4285,8 +4295,8 @@ msgstr "" #: /etc/rc.d/init.d/sec:98 msgid "" -"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|" -"status|dump}" +"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-" +"reload|status|dump}" msgstr "" #: /etc/rc.d/init.d/blktapctrl:82 /etc/rc.d/init.d/xenstored:90 @@ -4453,8 +4463,8 @@ msgstr "" #: /etc/sysconfig/network-scripts/network-functions-ipv6:1008 msgid "" -"Given IPv6 default gateway '$address' is link-local, but no scope or gateway " -"device is specified" +"Given IPv6 default gateway '$address' is link-local, but no scope or gateway" +" device is specified" msgstr "" #: /etc/rc.d/init.d/chronyd:86 @@ -4699,9 +4709,9 @@ msgstr "" msgid "httpd shutdown" msgstr "" -#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/halt:42 -#: /etc/rc.d/init.d/halt:44 /etc/rc.d/init.d/reboot:42 -#: /etc/rc.d/init.d/reboot:44 +#: /etc/rc.d/init.d/functions:536 /etc/rc.d/init.d/functions:536 +#: /etc/rc.d/init.d/halt:42 /etc/rc.d/init.d/halt:44 +#: /etc/rc.d/init.d/reboot:42 /etc/rc.d/init.d/reboot:44 msgid "$STRING" msgstr "" @@ -4735,8 +4745,8 @@ msgstr "" #: /etc/rc.d/init.d/cyrus-imapd:154 msgid "" -"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|" -"status|quickstart|quickstop}" +"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-" +"restart|status|quickstart|quickstop}" msgstr "" #: /etc/rc.d/init.d/qemu:31 -- cgit v1.2.1 From a9b0d6b5c655da96783851d5304c4d800d4e4553 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 7 Mar 2011 15:53:45 -0500 Subject: Don't do force/lazy umount for the first nfs umount. (#676851, ) This can cause hung tasks that aren't cleaned up or killed properly, as their dangling references won't get caught. --- rc.d/init.d/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 01cfed8c..ff6ac88c 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -124,7 +124,7 @@ __fgrep() { return 1 } -# __umount_loop awk_program fstab_file first_msg retry_msg umount_args +# __umount_loop awk_program fstab_file first_msg retry_msg retry_umount_args # awk_program should process fstab_file and return a list of fstab-encoded # paths; it doesn't have to handle comments in fstab_file. __umount_loop() { @@ -134,7 +134,7 @@ __umount_loop() { remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r) while [ -n "$remaining" -a "$retry" -gt 0 ]; do if [ "$retry" -eq 3 ]; then - action "$3" fstab-decode umount $5 $remaining + action "$3" fstab-decode umount '' $remaining else action "$4" fstab-decode umount $5 $remaining fi -- cgit v1.2.1 From d83589bf852cc971295c55466d6638a7b40269a2 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Thu, 10 Mar 2011 18:37:45 +0300 Subject: initscripts: execute fedora-sysinit-unhack after sysinit.target Currently both are started early during boot and in the best case are no-op, in the worst - hack is executed after unhack and leaves /dev/.in_sysinit hanging around forever. Make sure unhack is executed after hack and after sysinit.target as name suggests. Signed-off-by: Andrey Borzenkov --- systemd/system/fedora-sysinit-unhack.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd/system/fedora-sysinit-unhack.service b/systemd/system/fedora-sysinit-unhack.service index 86e20cd6..221d8bb1 100644 --- a/systemd/system/fedora-sysinit-unhack.service +++ b/systemd/system/fedora-sysinit-unhack.service @@ -1,8 +1,9 @@ [Unit] -Description=Bootup hack +Description=Bootup unhack DefaultDependencies=no Conflicts=shutdown.target Before=shutdown.target +After=fedora-sysinit-hack.service sysinit.target [Service] Type=oneshot -- cgit v1.2.1 From cec3312c40af12139d34ec25d60a9000279972fb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 10 Mar 2011 19:40:56 +0100 Subject: network-scripts/ifup-eth: also check /dev/.run/initramfs --- sysconfig/network-scripts/ifup-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 9377494c..1efa2719 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -178,7 +178,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then DHCLIENTCONF=''; fi; # copy any lease obtained by the initrd - for file in /dev/.dhclient-${DEVICE}.leases /dev/.initramfs/net.${DEVICE}.lease ; do + for file in /dev/.dhclient-${DEVICE}.leases /dev/{.run/initramfs,.initramfs/net.${DEVICE}.lease ; do if [ -f "${file}" ]; then mv -f $file /var/lib/dhclient/dhclient-${DEVICE}.leases [ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${DEVICE}.leases > /dev/null 2>&1 -- cgit v1.2.1 From 98b65a4e09626db8b948e15d41e73f690a8202e1 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 10 Mar 2011 19:46:29 +0100 Subject: network-scripts/ifup-eth: fix cec3312 and close braces --- sysconfig/network-scripts/ifup-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 1efa2719..4d7b8aea 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -178,7 +178,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then DHCLIENTCONF=''; fi; # copy any lease obtained by the initrd - for file in /dev/.dhclient-${DEVICE}.leases /dev/{.run/initramfs,.initramfs/net.${DEVICE}.lease ; do + for file in /dev/.dhclient-${DEVICE}.leases /dev/{.run/initramfs,.initramfs}/net.${DEVICE}.lease ; do if [ -f "${file}" ]; then mv -f $file /var/lib/dhclient/dhclient-${DEVICE}.leases [ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${DEVICE}.leases > /dev/null 2>&1 -- cgit v1.2.1 From bec37b082a490e101799810fe210aa273ad26de3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 10 Mar 2011 15:45:33 -0500 Subject: Fix check for unmanaged devices so it does the right thing with devices NM doesn't know about at all. (#670154) It was returning nonexistent devices, or devies NM knew nothing about (bridges), as being managed. --- sysconfig/network-scripts/network-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 0d2528ee..9a47449b 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -230,7 +230,7 @@ is_nm_active () is_nm_device_unmanaged () { - LANG=C nmcli -t --fields device,state dev status 2>/dev/null | grep -q "^${1}:unmanaged$" + LANG=C nmcli -t --fields GENERAL dev list iface "${1}" 2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }' } # Sets $alias to the device module if $? != 0 -- cgit v1.2.1 From 88592411ed0efb188a97872a69a5e417c21ffd3a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 10 Mar 2011 15:52:25 -0500 Subject: Revert "Call sync after nfs unmount, otherwise we'll hang when the kernel syncs later. (#637500)" This reverts commit decf19bb9dc7b70ad89f9154899e73df069f5e62. This is better handled by not doing a force/lazy umount the first time. (a9b0d6b5c655da96783851d5304c4d800d4e4553) --- rc.d/init.d/netfs | 1 - 1 file changed, 1 deletion(-) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 3713cf45..8d9854fb 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -116,7 +116,6 @@ case "$1" in $"Unmounting NFS filesystems: " \ $"Unmounting NFS filesystems (retry): " \ "-f -l" - sync fi if [ -n "$CIFSMTAB" ]; then for MNT in $CIFSMTAB; do -- cgit v1.2.1 From f1230e6e355d41bcc82f117d94b5fd87b32edea4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 10 Mar 2011 15:56:02 -0500 Subject: 9.26-1 --- initscripts.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 3d91ac3f..9a49593d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.25 +Version: 9.26 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -312,6 +312,19 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Mar 10 2011 Bill Nottingham - 9.26-1 +- network-functions: fix check for unmanaged devices (#670154) +- ifup-eth: also check /dev/.run/initramfs () +- systemd: execute fedora-sysinit-unhack after sysinit.target () +- init.d/functions: don't do force/lazy umount for the first nfs umount. (#676851, ) +- further sysctl.d fixes (#593211) +- init.d/functions: make killproc more granular when delay is passed. (#428029, ) +- ifup: add GVRP support (#597598, ) +- init.d/functions: add support for noauto crypt devices, to mirror systemd +- documentation updates +- bash cleanups () +- ifup: remove network device naming requirement from VLAN devices (#462095, ) + * Fri Feb 25 2011 Bill Nottingham - 9.25-1 - remove 'Red Hat Linux' references from sysctl.conf* () - rc.sysinit: add support for sysctl.d (#593211, ) -- cgit v1.2.1 From 89032e9049921024fa65c292adb48bc8eba1e5a0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 11 Mar 2011 11:38:00 -0500 Subject: Fix conditions so that they operate as OR, not AND. (#684125) --- systemd/system/fedora-autorelabel.service | 4 ++-- systemd/system/fedora-loadmodules.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service index 10b37f69..cd6a84b3 100644 --- a/systemd/system/fedora-autorelabel.service +++ b/systemd/system/fedora-autorelabel.service @@ -5,8 +5,8 @@ Requires=local-fs.target Conflicts=shutdown.target After=local-fs.target Before=sysinit.target shutdown.target -ConditionKernelCommandLine=autorelabel -ConditionPathExists=/.autorelabel +ConditionKernelCommandLine=|autorelabel +ConditionPathExists=|/.autorelabel [Service] ExecStart=/lib/systemd/fedora-autorelabel diff --git a/systemd/system/fedora-loadmodules.service b/systemd/system/fedora-loadmodules.service index 9b801258..cd2b4910 100644 --- a/systemd/system/fedora-loadmodules.service +++ b/systemd/system/fedora-loadmodules.service @@ -4,8 +4,8 @@ DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target -ConditionPathExists=/etc/rc.modules -ConditionDirectoryNotEmpty=/etc/sysconfig/modules/ +ConditionPathExists=|/etc/rc.modules +ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ [Service] ExecStart=/lib/systemd/fedora-loadmodules -- cgit v1.2.1 From fc73bbccaae3858ea3f895e746467a758e6b5593 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 11 Mar 2011 12:06:09 -0500 Subject: Support ipv6 routing rules by merging IPv4/IPv6, and route/rule code. (#680872, ) --- sysconfig/network-scripts/ifdown-routes | 10 ++++++--- sysconfig/network-scripts/ifup-ipv6 | 7 ------ sysconfig/network-scripts/ifup-routes | 39 +++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/sysconfig/network-scripts/ifdown-routes b/sysconfig/network-scripts/ifdown-routes index 00e592f7..3c62498a 100755 --- a/sysconfig/network-scripts/ifdown-routes +++ b/sysconfig/network-scripts/ifdown-routes @@ -12,16 +12,20 @@ fi MATCH='^[[:space:]]*(\#.*)?$' # Routing rules -FILES="/etc/sysconfig/network-scripts/rule-$1" +FILES="/etc/sysconfig/network-scripts/rule-$1 /etc/sysconfig/network-scripts/rule6-$1" if [ -n "$2" -a "$2" != "$1" ]; then - FILES="$FILES /etc/sysconfig/network-scripts/rule-$2" + FILES="$FILES /etc/sysconfig/network-scripts/rule-$2 /etc/sysconfig/network-scripts/rule6-$2" fi for file in $FILES; do if [ -f "$file" ]; then + proto= + if [ "$file" != "${file##*/rule6-}" ]; then + proto="-6" + fi { cat "$file" ; echo ; } | while read line; do if [[ ! "$line" =~ $MATCH ]]; then - /sbin/ip rule del $line + /sbin/ip $proto rule del $line fi done fi diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index 6f104dc5..93a55d6e 100755 --- a/sysconfig/network-scripts/ifup-ipv6 +++ b/sysconfig/network-scripts/ifup-ipv6 @@ -160,13 +160,6 @@ if [ -f /etc/sysconfig/static-routes-ipv6 ]; then done fi -# Setup additional static IPv6 routes (newer config style) -if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then - sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do - /sbin/ip -6 route add $line - done -fi - # Setup of 6to4, if configured if [ "$IPV6TO4INIT" = "yes" ]; then valid6to4config="yes" diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes index db3e51ea..ff8d5b56 100755 --- a/sysconfig/network-scripts/ifup-routes +++ b/sysconfig/network-scripts/ifup-routes @@ -6,6 +6,8 @@ if [ -z "$1" ]; then exit 1 fi +MATCH='^[[:space:]]*(\#.*)?$' + handle_file () { . $1 routenum=0 @@ -21,13 +23,26 @@ handle_file () { done } -FILES="/etc/sysconfig/network-scripts/route-$1" +handle_ip_file() { + local f t type= file=$1 proto="-4" + f=${file##*/} + t=${f%%-*} + type=${t%%6} + if [ "$type" != "$t" ]; then + proto="-6" + fi + { cat "$file" ; echo ; } | while read line; do + if [[ ! "$line" =~ $MATCH ]]; then + /sbin/ip $proto $type add $line + fi + done +} + +FILES="/etc/sysconfig/network-scripts/route-$1 /etc/sysconfig/network-scripts/route6-$1" if [ -n "$2" -a "$2" != "$1" ]; then - FILES="$FILES /etc/sysconfig/network-scripts/route-$2" + FILES="$FILES /etc/sysconfig/network-scripts/route-$2 /etc/sysconfig/network-scripts/route6-$2" fi -MATCH='^[[:space:]]*(\#.*)?$' - for file in $FILES; do if [ -f "$file" ]; then if grep -Eq '^[[:space:]]*ADDRESS[0-9]+=' $file ; then @@ -35,11 +50,7 @@ for file in $FILES; do handle_file $file ${1%:*} else # older format - { cat "$file" ; echo ; } | while read line; do - if [[ ! "$line" =~ $MATCH ]]; then - /sbin/ip route add $line - fi - done + handle_ip_file $file fi fi done @@ -52,17 +63,13 @@ CONFIG="/etc/sysconfig/network-scripts/$NICK.route" # Routing rules -FILES="/etc/sysconfig/network-scripts/rule-$1" +FILES="/etc/sysconfig/network-scripts/rule-$1 /etc/sysconfig/network-scripts/rule6-$1" if [ -n "$2" -a "$2" != "$1" ]; then - FILES="$FILES /etc/sysconfig/network-scripts/rule-$2" + FILES="$FILES /etc/sysconfig/network-scripts/rule-$2 /etc/sysconfig/network-scripts/rule6-$2" fi for file in $FILES; do if [ -f "$file" ]; then - { cat "$file" ; echo ; } | while read line; do - if [[ ! "$line" =~ $MATCH ]]; then - /sbin/ip rule add $line - fi - done + handle_ip_file $file fi done -- cgit v1.2.1 From e1a87364b0f8a99eb7afbc3c062aa1eb8d3e5fa3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 14 Mar 2011 11:11:20 -0400 Subject: Y kant eye spell? (#684465) --- inittab.systemd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inittab.systemd b/inittab.systemd index 3143379d..c9694e65 100644 --- a/inittab.systemd +++ b/inittab.systemd @@ -6,8 +6,8 @@ # # systemd uses 'targets' instead of runlevels. By default, there are two main targets: # -# multi-user.target: analagous to runlevel 3 -# graphical.target: analagous to runlevel 5 +# multi-user.target: analogous to runlevel 3 +# graphical.target: analogous to runlevel 5 # # To set a default target, run: # -- cgit v1.2.1 From 22c79dd133d0e0d72667c1d9c4cfd4e82c83e7a9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 15 Mar 2011 12:37:43 -0400 Subject: Fix mishandled argument to fstab-decode. (#685137) --- rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index ff6ac88c..ec4f2bbe 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -134,7 +134,7 @@ __umount_loop() { remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r) while [ -n "$remaining" -a "$retry" -gt 0 ]; do if [ "$retry" -eq 3 ]; then - action "$3" fstab-decode umount '' $remaining + action "$3" fstab-decode umount $remaining else action "$4" fstab-decode umount $5 $remaining fi -- cgit v1.2.1 From 920db32a62a82317147d1d00f1a5c0e615ce60fe Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 17 Mar 2011 12:33:22 -0400 Subject: 9.27-1 --- initscripts.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 9a49593d..c7d7fbe8 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.26 +Version: 9.27 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -312,6 +312,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Mar 17 2011 Bill Nottingham - 9.27-1 +- init.d/functions: fix mishandled argument to fstab-decode. (#685137) +- support ipv6 routing rules, merge route/rule code (#680872, ) +- autorelabel.service, loadmodules.service: fix conditions so that they operate as OR, not AND. (#684125) + * Thu Mar 10 2011 Bill Nottingham - 9.26-1 - network-functions: fix check for unmanaged devices (#670154) - ifup-eth: also check /dev/.run/initramfs () -- cgit v1.2.1 From 5e2b364ebd6808c43f46f7853d2fe6de4edbada1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 22 Mar 2011 14:27:11 -0400 Subject: Add a comment explaining the oft-confused -t nox,y,z mount syntax. The 'no' applies to all listed filesystem types, not just the first. Since this comes up in bugzilla once every month or two, explicitly comment it. --- rc.d/init.d/netfs | 1 + rc.d/rc.sysinit | 1 + 2 files changed, 2 insertions(+) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 8d9854fb..77a0a68d 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -98,6 +98,7 @@ case "$1" in fi } touch /var/lock/subsys/netfs + # The 'no' applies to all listed filesystem types. See mount(8). action $"Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs ;; stop) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index ad2c83e5..6067ea88 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -494,6 +494,7 @@ fi # Mount all other filesystems (except for NFS and /proc, which is already # mounted). Contrary to standard usage, # filesystems are NOT unmounted in single user mode. +# The 'no' applies to all listed filesystem types. See mount(8). if [ "$READONLY" != "yes" ] ; then action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev else -- cgit v1.2.1 From ac1bb973ece7e34f2f9a1606f4b9559e48b2e131 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 15:57:14 -0400 Subject: Add a net_log() function. (#507515, #689525) --- sysconfig/network-scripts/network-functions | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 9a47449b..ed318b0e 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -424,3 +424,26 @@ change_resolv_conf () fi; return $r; } + +# Logging function +# +# Usage: net_log +# +# Default level is 'info'. + +net_log() { + local message="$1" + local level="$2" + local name="$3" + + [ -z "$message" ] && return 1 + [ -z "$level" ] && level=info + [ -z "$name" ] && name=$0 + + echo $message + + if [ -x /usr/bin/logger ]; then + /usr/bin/logger -p daemon.$level -t "$name" "$message" + fi + return 0 +} -- cgit v1.2.1 From 579c34c464ff22339c76bfbf51ce122a8961c0fc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 15:58:16 -0400 Subject: Make net_log()'s output similar to that of the ipv6 logger. This will cause output strings to change, of course, so it's not really appropriate for earlier releases. --- sysconfig/network-scripts/network-functions | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index ed318b0e..14d13fee 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -440,7 +440,22 @@ net_log() { [ -z "$level" ] && level=info [ -z "$name" ] && name=$0 - echo $message + case $level in + 'debug') + local txt_level=$"DEBUG " + ;; + 'err') + local txt_level=$"ERROR " + ;; + 'warning') + local txt_level=$"WARN " + ;; + 'info') + local txt_level=$"INFO " + ;; + esac + + echo "$txt_level: [$name] $message" if [ -x /usr/bin/logger ]; then /usr/bin/logger -p daemon.$level -t "$name" "$message" -- cgit v1.2.1 From 0d4c67a520b64f029d094e9a3d10ec179683c033 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 16:08:45 -0400 Subject: Switch the default logging value to error. It's what's used the most. --- sysconfig/network-scripts/network-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 14d13fee..8d92d081 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -429,7 +429,7 @@ change_resolv_conf () # # Usage: net_log # -# Default level is 'info'. +# Default level is 'err'. net_log() { local message="$1" @@ -437,7 +437,7 @@ net_log() { local name="$3" [ -z "$message" ] && return 1 - [ -z "$level" ] && level=info + [ -z "$level" ] && level=err [ -z "$name" ] && name=$0 case $level in -- cgit v1.2.1 From 255a2b7db036fd4b1df99028ba6298c4b5837485 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 16:17:16 -0400 Subject: Use net_log where appropriate. --- ppp/ip-up.ipv6to4 | 12 ++++++------ rc.d/init.d/network | 2 +- sysconfig/network-scripts/ifdown-eth | 4 ++-- sysconfig/network-scripts/ifdown-sit | 2 +- sysconfig/network-scripts/ifdown-tunnel | 2 +- sysconfig/network-scripts/ifup | 8 ++++---- sysconfig/network-scripts/ifup-aliases | 18 +++++++++--------- sysconfig/network-scripts/ifup-ctc | 2 +- sysconfig/network-scripts/ifup-eth | 16 ++++++++-------- sysconfig/network-scripts/ifup-ipv6 | 28 ++++++++++++++-------------- sysconfig/network-scripts/ifup-sit | 6 +++--- sysconfig/network-scripts/ifup-tunnel | 4 ++-- 12 files changed, 52 insertions(+), 52 deletions(-) diff --git a/ppp/ip-up.ipv6to4 b/ppp/ip-up.ipv6to4 index 6343fbc5..c41ad828 100644 --- a/ppp/ip-up.ipv6to4 +++ b/ppp/ip-up.ipv6to4 @@ -84,11 +84,11 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$ipv4addr" ]; then # Test for non-global IPv4 address if ! ipv6_test_ipv4_addr_global_usable $ipv4addr; then - echo $"Given IPv4 address '$ipv4addr' is not globally usable" + net_log $"Given IPv4 address '$ipv4addr' is not globally usable" info valid6to4config="no" fi else - echo $"IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" + net_log $"IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" info valid6to4config="no" fi if [ -z "$IPV6TO4_RELAY" ]; then @@ -120,7 +120,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$IPV6TO4_MTU" ]; then if [ $IPV6TO4_MTU -gt $tunnelmtu ]; then - echo $"Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" + net_log $"Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" warning else tunnelmtu=$IPV6TO4_MTU fi @@ -135,7 +135,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Add default route, if device matches if [ "$IPV6_DEFAULTDEV" = "tun6to4" ]; then if [ -n "$IPV6_DEFAULTGW" ]; then - echo $"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" + net_log $"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" warning fi ipv6_set_default_route $ipv6to4_relay tun6to4 fi @@ -183,10 +183,10 @@ if [ "$IPV6TO4INIT" = "yes" ]; then ipv6_add_addr_on_device ${dev} ${ipv6to4prefix}${suf} done else - echo $"Error occured while calculating the IPv6to4 prefix" + net_log $"Error occured while calculating the IPv6to4 prefix" fi else - echo $"radvd control enabled, but config is not complete" + net_log $"radvd control enabled, but config is not complete" fi fi fi diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 738a3440..dd4e7700 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -79,7 +79,7 @@ case "$1" in case "$VLAN" in yes) if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1 ; then - echo $"No 802.1Q VLAN support available in kernel." + net_log $"No 802.1Q VLAN support available in kernel." fi ;; esac diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 530975c3..80b99544 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -39,13 +39,13 @@ if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then if [ -n "${NEWCONFIG}" ]; then eval $(LANG=C grep -F "DEVICE=" $NEWCONFIG) else - echo $"Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." + net_log $"Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." exit 1 fi if [ -n "${NEWCONFIG}" -a "${NEWCONFIG##*/}" != "${CONFIG##*/}" -a "${DEVICE}" = "${REALDEVICE}" ]; then exec /sbin/ifdown ${NEWCONFIG} else - echo $"Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." + net_log $"Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." exit 1 fi fi diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit index 314b91f1..39e9c50f 100755 --- a/sysconfig/network-scripts/ifdown-sit +++ b/sysconfig/network-scripts/ifdown-sit @@ -37,7 +37,7 @@ REALDEVICE=${DEVICE%%:*} # Generic tunnel device sit0 is not supported here if [ "$DEVICE" = "sit0" ]; then - echo $"Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and restart (IPv6) networking" + net_log $"Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and restart (IPv6) networking" exit 1 fi diff --git a/sysconfig/network-scripts/ifdown-tunnel b/sysconfig/network-scripts/ifdown-tunnel index a1f643c7..2853a0a8 100755 --- a/sysconfig/network-scripts/ifdown-tunnel +++ b/sysconfig/network-scripts/ifdown-tunnel @@ -33,7 +33,7 @@ source_config # Generic tunnel devices are not supported here if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then - echo $"Device '$DEVICE' isn't supported as a valid GRE device name." + net_log $"Device '$DEVICE' isn't supported as a valid GRE device name." exit 1 fi diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 0089f3e9..f2980b39 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -83,21 +83,21 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//') # PHYSDEV should be set in ifcfg-vlan* file if test -z "$PHYSDEV"; then - echo $"PHYSDEV should be set for device ${DEVICE}" + net_log $"PHYSDEV should be set for device ${DEVICE}" exit 1 fi fi if [ -n "$VID" ]; then if [ ! -d /proc/net/vlan ]; then if ! modprobe 8021q >/dev/null 2>&1 ; then - echo $"No 802.1Q VLAN support available in kernel for device ${DEVICE}" + net_log $"No 802.1Q VLAN support available in kernel for device ${DEVICE}" exit 1 fi fi is_available ${PHYSDEV} || { if [ "$?" = "1" ] ; then - echo $"$alias device ${DEVICE} does not seem to be present, delaying initialization." + net_log $"$alias device ${DEVICE} does not seem to be present, delaying initialization." exit 1 else exit 0 @@ -121,7 +121,7 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then ip link add dev ${DEVICE} link ${PHYSDEV} type vlan id ${VID} ${FLAG_REORDER_HDR} ${FLAG_GVRP} || { (/usr/bin/logger -p daemon.info -t ifup \ $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" &)& - echo $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" + net_log $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" exit 1 } fi diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index 1312eede..6fa71921 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -125,7 +125,7 @@ eval ` ( # read defaults from the parent config file [ -f $PARENTCONFIG ] || { - echo $"Missing config file $PARENTCONFIG." >&2 + net_log $"Missing config file $PARENTCONFIG." exit 1 } eval ` ( @@ -169,7 +169,7 @@ function new_interface () MATCH='^[0-9A-Za-z_]*$' if (LC_ALL=C; [[ ! "$DEVNUM" =~ $MATCH ]]); then - echo $"error in $FILE: invalid alias number" >&2 + net_log $"error in $FILE: invalid alias number" return 1 fi @@ -179,17 +179,17 @@ function new_interface () "; if [ -n "$ipseen" ]; then - echo $"error in $FILE: already seen ipaddr $IPADDR in $ipseen" >&2 + net_log $"error in $FILE: already seen ipaddr $IPADDR in $ipseen" return 1 fi if [ -n "$devseen" ]; then - echo $"error in $FILE: already seen device $parent_device:$DEVNUM in $devseen" >&2 + net_log $"error in $FILE: already seen device $parent_device:$DEVNUM in $devseen" return 1 fi if [ -z "$DEVICE" -o -z "$IPADDR" ]; then - echo $"error in $FILE: didn't specify device or ipaddr" >&2 + net_log $"error in $FILE: didn't specify device or ipaddr" return 1 fi @@ -256,7 +256,7 @@ function new_interface () setup_this=yes fi if [ -n "$rdev_mark" -a "$rdev_mark" != "$newmark" ]; then - echo $"error in ifcfg-${parent_device}: files" >&2 + net_log $"error in ifcfg-${parent_device}: files" return 1 fi eval " rdev_${DEVNUM}_mark=\$newmark "; @@ -267,7 +267,7 @@ function new_interface () if [ -n "$rdevip" -a "$rdevip" != "${DEVNUM}" ]; then eval " mark_remove=\$rdev_${rdevip}_mark "; if [ -n "$mark_remove" -a "$mark_remove" != "remove" ]; then - echo $"error in ifcfg-${parent_device}: files" >&2 + net_log $"error in ifcfg-${parent_device}: files" return 1 fi if [ "$mark_remove" != "remove" ]; then @@ -337,11 +337,11 @@ for FILE in ifcfg-${parent_device}-range* ; do ipaddr_endnum=${IPADDR_END##*.} if [ "${IPADDR_START%.*}" != "${IPADDR_END%.*}" ]; then - echo $"error in $FILE: IPADDR_START and IPADDR_END don't agree" >&2; continue + net_log $"error in $FILE: IPADDR_START and IPADDR_END don't agree"; continue fi if [ $ipaddr_startnum -gt $ipaddr_endnum ]; then - echo $"error in $FILE: IPADDR_START greater than IPADDR_END" >&2; continue + net_log $"error in $FILE: IPADDR_START greater than IPADDR_END"; continue fi ipaddr_num=$ipaddr_startnum diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc index 514c102b..e268d7cc 100755 --- a/sysconfig/network-scripts/ifup-ctc +++ b/sysconfig/network-scripts/ifup-ctc @@ -33,7 +33,7 @@ timeout=0 while ! ping -w 30 -c 1 ${GATEWAY} &>/dev/null; do timeout=$(($timeout + 1)) if [ $timeout = 20 ]; then - echo $"ERROR: ${DEVICE} did not come up!" + net_log $"ERROR: ${DEVICE} did not come up!" break fi done diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 4d7b8aea..b81234d2 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -40,7 +40,7 @@ is_available ${REALDEVICE} if [ -n "${HWADDR}" ]; then FOUNDMACADDR=$(get_hwaddr ${REALDEVICE}) if [ "${FOUNDMACADDR}" != "${HWADDR}" -a "${FOUNDMACADDR}" != "${MACADDR}" ]; then - echo $"Device ${DEVICE} has different MAC address than expected, ignoring." + net_log $"Device ${DEVICE} has different MAC address than expected, ignoring." exit 1 fi fi @@ -48,7 +48,7 @@ fi # If the device is a bridge, create it with brctl, if available. if [ "${TYPE}" = "Bridge" ]; then if [ ! -x /usr/sbin/brctl ]; then - echo $"Bridge support not available: brctl not found" + net_log $"Bridge support not available: brctl not found" exit 1 fi if [ ! -d /sys/class/net/${DEVICE}/bridge ]; then @@ -61,7 +61,7 @@ fi # If the device is a tap device, create it with tunctl, if available. if [ "${TYPE}" = "Tap" ]; then if [ ! -x /usr/sbin/tunctl ]; then - echo $"Tap support not available: tunctl not found" + net_log $"Tap support not available: tunctl not found" exit 1 fi [ -n "${OWNER}" ] && OWNER="-u ${OWNER}" @@ -71,9 +71,9 @@ fi # now check the real state is_available ${REALDEVICE} || { if [ -n "$alias" ]; then - echo $"$alias device ${DEVICE} does not seem to be present, delaying initialization." + net_log $"$alias device ${DEVICE} does not seem to be present, delaying initialization." else - echo $"Device ${DEVICE} does not seem to be present, delaying initialization." + net_log $"Device ${DEVICE} does not seem to be present, delaying initialization." fi exit 1 } @@ -219,7 +219,7 @@ else ip link set dev ${REALDEVICE} $(toggle_value arp $ARP) if ! ip link set dev ${REALDEVICE} up ; then - echo $"Failed to bring up ${DEVICE}." + net_log $"Failed to bring up ${DEVICE}." exit 1 fi @@ -250,13 +250,13 @@ else if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C grep -q "${ipaddr[$idx]}/${prefix[$idx]}" ; then [ "${REALDEVICE}" != "lo" ] && \ if ! /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]} ; then - echo $"Error, some other host already uses address ${ipaddr[$idx]}." + net_log $"Error, some other host already uses address ${ipaddr[$idx]}." exit 1 fi if ! ip addr add ${ipaddr[$idx]}/${prefix[$idx]} \ brd ${broadcast[$idx]:-+} dev ${REALDEVICE} ${SCOPE} label ${DEVICE}; then - echo $"Error adding address ${ipaddr[$idx]} for ${DEVICE}." + net_log $"Error adding address ${ipaddr[$idx]} for ${DEVICE}." fi fi diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index 93a55d6e..478682fb 100755 --- a/sysconfig/network-scripts/ifup-ipv6 +++ b/sysconfig/network-scripts/ifup-ipv6 @@ -97,8 +97,8 @@ if [ "$IPV6FORWARDING" = "yes" ]; then # Check, if global IPv6 forwarding was already set by global script if [ $ipv6_global_forwarding_current -ne 1 ]; then - echo $"Global IPv6 forwarding is enabled in configuration, but not currently enabled in kernel" - echo $"Please restart network with '/sbin/service network restart'" + net_log $"Global IPv6 forwarding is enabled in configuration, but not currently enabled in kernel" + net_log $"Please restart network with '/sbin/service network restart'" fi ipv6_local_forwarding=1 @@ -114,8 +114,8 @@ else # Check, if global IPv6 forwarding was already set by global script if [ $ipv6_global_forwarding_current -ne 0 ]; then - echo $"Global IPv6 forwarding is disabled in configuration, but not currently disabled in kernel" - echo $"Please restart network with '/sbin/service network restart'" + net_log $"Global IPv6 forwarding is disabled in configuration, but not currently disabled in kernel" + net_log $"Please restart network with '/sbin/service network restart'" fi ipv6_local_forwarding=0 @@ -144,7 +144,7 @@ fi if [ "$IPV6_PRIVACY" = "rfc3041" ]; then /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.use_tempaddr=2 >/dev/null 2>&1 if [ $? -ne 0 ]; then - echo $"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel" + net_log $"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel" fi fi @@ -168,7 +168,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then ipv6_test_device_status tun6to4 if [ $? = 0 ]; then # device is already up - echo $"Device 'tun6to4' (from '$DEVICE') is already up, shutdown first" + net_log $"Device 'tun6to4' (from '$DEVICE') is already up, shutdown first" exit 1 fi @@ -195,7 +195,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$ipv4addr" ]; then if ! ipv6_test_ipv4_addr_global_usable $ipv4addr; then - echo $"Given IPv4 address '$ipv4addr' is not globally usable" + net_log $"Given IPv4 address '$ipv4addr' is not globally usable" info valid6to4config="no" fi if [ -z "$IPV6TO4_RELAY" ]; then @@ -208,7 +208,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then valid6to4config="no" fi else - echo $"IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" + net_log $"IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" info valid6to4config="no" fi @@ -223,7 +223,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$IPV6TO4_MTU" ]; then if [ $IPV6TO4_MTU -gt $tunnelmtu ]; then - echo $"Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" + net_log $"Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" warning else tunnelmtu=$IPV6TO4_MTU fi @@ -237,7 +237,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Add default route, if device matches if [ "$IPV6_DEFAULTDEV" = "tun6to4" ]; then if [ -n "$IPV6_DEFAULTGW" ]; then - echo $"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" + net_log $"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" warning fi ipv6_set_default_route $ipv6to4_relay tun6to4 fi @@ -273,7 +273,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then # RADVD is in use, so forwarding of IPv6 packets should be enabled, display warning if [ $ipv6_global_forwarding_current -ne 1 ]; then - echo $"Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't" + net_log $"Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't" warning fi if [ -n "$IPV6TO4_ROUTING" ]; then @@ -286,17 +286,17 @@ if [ "$IPV6TO4INIT" = "yes" ]; then ipv6_add_addr_on_device ${dev} ${ipv6to4prefix}${suf} done else - echo $"Error occurred while calculating the IPv6to4 prefix" + net_log $"Error occurred while calculating the IPv6to4 prefix" fi else - echo $"radvd control enabled, but config is not complete" + net_log $"radvd control enabled, but config is not complete" fi # Control running radvd ipv6_trigger_radvd up "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE fi else - echo $"6to4 configuration is not valid" + net_log $"6to4 configuration is not valid" exit 1 fi fi diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit index 6d1a8c79..498305b7 100755 --- a/sysconfig/network-scripts/ifup-sit +++ b/sysconfig/network-scripts/ifup-sit @@ -55,12 +55,12 @@ ipv6_test || exit 1 # Generic tunnel device sit0 is not supported here if [ "$DEVICE" = "sit0" ]; then - echo $"Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and restart (IPv6) networking" + net_log $"Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and restart (IPv6) networking" exit 1 fi if [ -z "$IPV6TUNNELIPV4" ]; then - echo $"Missing remote IPv4 address of tunnel, configuration is not valid" + net_log $"Missing remote IPv4 address of tunnel, configuration is not valid" exit 1 fi @@ -68,7 +68,7 @@ fi ipv6_test_device_status $DEVICE if [ $? = 0 ]; then # device is already up - echo $"Device '$DEVICE' is already up, please shutdown first" + net_log $"Device '$DEVICE' is already up, please shutdown first" exit 1 fi diff --git a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel index 8fd631e5..c14e0658 100755 --- a/sysconfig/network-scripts/ifup-tunnel +++ b/sysconfig/network-scripts/ifup-tunnel @@ -46,14 +46,14 @@ case "$TYPE" in /sbin/modprobe ipip ;; *) - echo $"Invalid tunnel type $TYPE" + net_log $"Invalid tunnel type $TYPE" exit 1 ;; esac # Generic tunnel devices are not supported here if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then - echo $"Device '$DEVICE' isn't supported as a valid GRE device name." + net_log $"Device '$DEVICE' isn't supported as a valid GRE device name." exit 1 fi -- cgit v1.2.1 From 5bb9c661652d0836f47ac47fcac15248ada1ab05 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 16:27:42 -0400 Subject: Convert ipv6_log users to net_log. --- sysconfig/network-scripts/network-functions-ipv6 | 255 +++++------------------ 1 file changed, 51 insertions(+), 204 deletions(-) diff --git a/sysconfig/network-scripts/network-functions-ipv6 b/sysconfig/network-scripts/network-functions-ipv6 index 64b9b593..394367bb 100644 --- a/sysconfig/network-scripts/network-functions-ipv6 +++ b/sysconfig/network-scripts/network-functions-ipv6 @@ -11,158 +11,6 @@ # - - - - -##### Logging function -# $1: : message string -# $2: [stdout|stderr].[err|warn[ing]|inf[o]|notice] : log level with optional channel, default is "stdout.notice" -# [syslog.[facility.].err|warn[ing]|inf[o]|notice : syslog channel, default is "syslog.user.notice" -# $3: : name of function which calls this log function, can be empty using "" -# return code: 0=ok 1=argument error 3=major problem -ipv6_log() { - local message="$1" - local level="$2" - local name="$3" - - if [ -z "$message" ]; then - echo $"ERROR: [ipv6_log] Missing 'message' (arg 1)" >/dev/stderr - return 1 - fi - if [ -z "$level" ]; then - local level="stdout.notice" - fi - - - # Map loglevel now - local fn=1 - local fnawk="print \$$fn" - local t="$(echo $level | awk -F. "{ $fnawk }")" - - # Check channel, if given - case $t in - 'stdout'|'stderr'|'syslog') - local channel="$t" - local fn=$(($fn + 1)) - ;; - *) - local channel="stdout" - ;; - esac - - # Check syslog facilty, if given - if [ "$channel" = "syslog" ]; then - local fnawk="print \$$fn" - local t="$(echo $level | awk -F. "{ $fnawk }")" - case $t in - 'local0'|'local1'|'local2'|'local3'|'local4'|'local5'|'local6'|'local7'|'daemon') - local facility="$t" - local fn=$(($fn + 1)) - ;; - *) - local facility="user" - ;; - esac - fi - - local fnawk="print \$$fn" - local t="$(echo $level | awk -F. "{ $fnawk }")" - - # Map priority - [ "$t" = "inf" ] && local t="info" - [ "$t" = "deb" ] && local t="debug" - [ "$t" = "warning" ] && local t="warn" - [ "$t" = "error" ] && local t="err" - [ "$t" = "critical" ] && local t="crit" - - # Check priority, if given - case $t in - 'info'|'debug'|'notice'|'warn'|'err'|'crit') - local priority="$t" - local fn=$(($fn + 1)) - ;; - *) - local priority="notice" - ;; - esac - - local fnawk="print \$$fn" - local t="$(echo $level | awk -F. "{ $fnawk }")" - if [ -n "$t" ]; then - echo $"ERROR: [ipv6_log] Loglevel isn't valid '$level' (arg 2)" >/dev/stderr - return 1 - fi - - # Generate function text - if [ -z "$name" ]; then - local txt_name="" - else - local txt_name="[$name]" - fi - - # Log message - case $channel in - 'stdout'|'stderr') - # Generate level text - case $priority in - 'debug') - local txt_level=$"DEBUG " - ;; - 'err') - local txt_level=$"ERROR " - ;; - 'warn') - local txt_level=$"WARN " - ;; - 'crit') - local txt_level=$"CRITICAL " - ;; - 'info') - local txt_level=$"INFO " - ;; - 'notice') - local txt_level=$"NOTICE " - ;; - esac - - [ -n "$txt_name" ] && local txt_name="$txt_name " - - if [ "$channel" = "stderr" ]; then - echo "$txt_level: ${txt_name}${message}" >/dev/stderr - elif [ "$channel" = "stdout" ]; then - echo "$txt_level: ${txt_name}${message}" - fi - ;; - 'syslog') - # note: logger resides in /usr/bin, but not used by default - if ! [ -x /usr/bin/logger ]; then - echo $"ERROR: [ipv6_log] Syslog is chosen, but binary 'logger' doesn't exist or isn't executable" >/dev/stderr - return 3 - fi - if [ -z "$txt_name" ]; then - /usr/bin/logger -p $facility.$priority $message - else - /usr/bin/logger -p $facility.$priority -t "$txt_name" "$message" - fi - ;; - *) - echo $"ERROR: [ipv6_log] Cannot log to channel '$channel'" >/dev/stderr - return 3 - ;; - esac - - return 0 -} - - -###### Beginning of main code here, always executed on "source|. network-functions-ipv6" - - - -###### End of main code here - - ##### Test for IPv6 capabilites # $1: (optional) testflag: currently supported: "testonly" (do not load a module) # return code: 0=ok 2=IPv6 test fails @@ -178,7 +26,6 @@ ipv6_test() { modprobe ipv6 if ! [ -f /proc/net/if_inet6 ]; then - # ipv6_log $"Kernel is not compiled with IPv6 support" crit $fn return 2 fi fi @@ -206,12 +53,12 @@ ipv6_add_route() { local device=$3 # maybe empty if [ -z "$networkipv6" ]; then - ipv6_log $"Missing parameter 'IPv6-network' (arg 1)" err $fn + net_log $"Missing parameter 'IPv6-network' (arg 1)" err $fn return 1 fi if [ -z "$gatewayipv6" ]; then - ipv6_log $"Missing parameter 'IPv6-gateway' (arg 2)" err $fn + net_log $"Missing parameter 'IPv6-gateway' (arg 2)" err $fn return 1 fi @@ -236,10 +83,10 @@ ipv6_add_route() { true elif echo $returntxt | LC_ALL=C grep -q "No route to host"; then # Netlink: "No route to host" - ipv6_log $"'No route to host' adding route '$networkipv6' via gateway '$gatewayipv6' through device '$device'" warn $fn + net_log $"'No route to host' adding route '$networkipv6' via gateway '$gatewayipv6' through device '$device'" err $fn return 3 else - ipv6_log $"Unknown error" warn $fn + net_log $"Unknown error" err $fn return 3 fi fi @@ -264,7 +111,7 @@ ipv6_enable_autotunnel() { /sbin/ip link set sit0 up if ! ipv6_test_device_status sit0; then - ipv6_log $"Tunnel device 'sit0' enabling didn't work" err $fn + net_log $"Tunnel device 'sit0' enabling didn't work" err $fn return 3 fi @@ -290,12 +137,12 @@ ipv6_add_addr_on_device() { local address=$2 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi if [ -z "$address" ]; then - ipv6_log $"Missing parameter 'IPv6-address' (arg 2)" err $fn + net_log $"Missing parameter 'IPv6-address' (arg 2)" err $fn return 1 fi @@ -309,13 +156,13 @@ ipv6_add_addr_on_device() { if [ "$result" = "0" ]; then true elif [ "$result" != "11" ]; then - ipv6_log $"Device '$device' doesn't exist" err $fn + net_log $"Device '$device' doesn't exist" err $fn return 3 else /sbin/ip link set $device up if ! ipv6_test_device_status $device; then - ipv6_log $"Device '$device' enabling didn't work" err $fn + net_log $"Device '$device' enabling didn't work" err $fn return 3 fi fi @@ -336,7 +183,7 @@ ipv6_add_addr_on_device() { if [ $result -eq 2 ]; then return 0 elif [ $result -ne 0 ]; then - ipv6_log $"Cannot add IPv6 address '$address' on dev '$device'" err $fn + net_log $"Cannot add IPv6 address '$address' on dev '$device'" err $fn return 3 fi @@ -353,7 +200,7 @@ ipv6_cleanup_device() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi @@ -382,7 +229,7 @@ ipv6_cleanup_6to4_device() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi @@ -462,7 +309,7 @@ ipv6_test_device_status() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi @@ -493,7 +340,7 @@ ipv6_create_6to4_prefix() { local ipv4addr=$1 if [ -z "$ipv4addr" ]; then - ipv6_log $"Missing parameter 'IPv4 address' (arg 1)" stderr.err $fn + net_log $"Missing parameter 'IPv4 address' (arg 1)" err $fn fi local major1="${ipv4addr%%.*}" @@ -533,7 +380,7 @@ ipv6_create_6to4_relay_address() { local addr=$1 if [ -z "$addr" ]; then - ipv6_log $"Missing parameter 'address' (arg 1)" stderr.err $fn + net_log $"Missing parameter 'address' (arg 1)" err $fn return 1 fi @@ -544,11 +391,11 @@ ipv6_create_6to4_relay_address() { # IPv4 globally usable local ipv6to4_relay="::$addr" else - ipv6_log $"Given address '$addr' is not a global IPv4 one (arg 1)" stderr.err $fn + net_log $"Given address '$addr' is not a global IPv4 one (arg 1)" err $fn return 1 fi else - ipv6_log $"Given address '$addr' is not a valid IPv4 one (arg 1)" stderr.err $fn + net_log $"Given address '$addr' is not a valid IPv4 one (arg 1)" err $fn return 1 fi @@ -577,18 +424,18 @@ ipv6_add_6to4_tunnel() { local localipv4=$5 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi if [ -z "$globalipv4" ]; then - ipv6_log $"Missing parameter 'global IPv4 address' (arg 2)" err $fn + net_log $"Missing parameter 'global IPv4 address' (arg 2)" err $fn return 1 fi # Check device if [ "$device" != "tun6to4" ]; then - ipv6_log $"Given device '$device' is not supported (arg 1)" err $fn + net_log $"Given device '$device' is not supported (arg 1)" err $fn return 1 fi @@ -639,13 +486,13 @@ ipv6_cleanup_6to4_tunnels() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi # Check device if [ "$device" != "tun6to4" ]; then - ipv6_log $"Given device '$device' is not supported (arg 1)" err $fn + net_log $"Given device '$device' is not supported (arg 1)" err $fn return 1 fi @@ -673,18 +520,18 @@ ipv6_del_6to4_tunnel() { local localipv4=$2 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi if [ -z "$localipv4" ]; then - ipv6_log $"Missing parameter 'local IPv4 address' (arg 2)" err $fn + net_log $"Missing parameter 'local IPv4 address' (arg 2)" err $fn return 1 fi # Check device if [ "$device" != "tun6to4" ]; then - ipv6_log $"Given device '$device' is not supported (arg 1)" err $fn + net_log $"Given device '$device' is not supported (arg 1)" err $fn return 1 fi @@ -715,12 +562,12 @@ ipv6_add_tunnel_device() { local addressipv4tunnellocal=$4 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi if [ -z "$addressipv4tunnel" ]; then - ipv6_log $"Missing parameter 'IPv4-tunnel address' (arg 2)" err $fn + net_log $"Missing parameter 'IPv4-tunnel address' (arg 2)" err $fn return 1 fi @@ -740,7 +587,7 @@ ipv6_add_tunnel_device() { if [ "$addressipv4tunnel" != "0.0.0.0" -a "$addressipv4tunnel" != "any" ]; then /sbin/ip tunnel show remote $addressipv4tunnel 2>/dev/null | LC_ALL=C grep -w "ipv6/ip" | while IFS=":" read devnew rest; do if [ "$devnew" != "$device" ]; then - ipv6_log $"Given remote address '$addressipv4tunnel' on tunnel device '$device' is already configured on device '$devnew'" err $fn + net_log $"Given remote address '$addressipv4tunnel' on tunnel device '$device' is already configured on device '$devnew'" err $fn return 3 fi done @@ -753,14 +600,14 @@ ipv6_add_tunnel_device() { # Test, whether "ip tunnel show" reports valid content if ! /sbin/ip tunnel show $device 2>/dev/null | LC_ALL=C grep -q -w "remote"; then - ipv6_log $"Tunnel device '$device' creation didn't work" err $fn + net_log $"Tunnel device '$device' creation didn't work" err $fn return 3 fi /sbin/ip link set $device up if ! ipv6_test_device_status $device; then - ipv6_log $"Tunnel device '$device' bringing up didn't work" err $fn + net_log $"Tunnel device '$device' bringing up didn't work" err $fn return 3 fi @@ -793,7 +640,7 @@ ipv6_del_tunnel_device() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi @@ -851,16 +698,16 @@ ipv6_get_ipv4addr_of_tunnel() { local selection=$2 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" stderr.err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi if [ -z "$selection" ]; then - ipv6_log $"Missing parameter 'selection' (arg 2)" stderr.err $fn + net_log $"Missing parameter 'selection' (arg 2)" err $fn return 1 fi if [ "$selection" != "local" -a "$selection" != "remote" ]; then - ipv6_log $"Unsupported selection '$selection' specified (arg 2)" stderr.err $fn + net_log $"Unsupported selection '$selection' specified (arg 2)" err $fn return 1 fi @@ -904,7 +751,7 @@ ipv6_get_ipv4addr_of_device() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" stderr.err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi @@ -943,18 +790,18 @@ ipv6_set_mtu() { local ipv6_mtu=$2 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi if [ -z "$ipv6_mtu" ]; then - ipv6_log $"Missing parameter 'IPv6 MTU' (arg 2)" err $fn + net_log $"Missing parameter 'IPv6 MTU' (arg 2)" err $fn return 1 fi # Check range if [ $ipv6_mtu -lt 1280 -o $ipv6_mtu -gt 65535 ]; then - ipv6_log $"Given IPv6 MTU '$ipv6_mtu' is out of range" err $fn + net_log $"Given IPv6 MTU '$ipv6_mtu' is out of range" err $fn return 1 fi @@ -991,13 +838,13 @@ ipv6_set_default_route() { local device_scope=$(echo $address | awk -F% '{ print $2 }') if [ -z "$addressgw" ]; then - ipv6_log $"Given IPv6 default gateway '$address' is not in proper format" err $fn + net_log $"Given IPv6 default gateway '$address' is not in proper format" err $fn return 3 fi # Scope device has precedence if [ -n "$device_scope" -a -n "$device" -a "$device_scope" != "$device" ]; then - ipv6_log $"Given IPv6 default gateway '$address' has scope '$device_scope' defined, given default gateway device '$device' will be not used" inf $fn + net_log $"Given IPv6 default gateway '$address' has scope '$device_scope' defined, given default gateway device '$device' will be not used" info $fn local device="" fi @@ -1005,7 +852,7 @@ ipv6_set_default_route() { if echo $addressgw | LC_ALL=C grep -qi "^fe80:"; then if [ -z "$device_scope" ]; then if [ -z "$device" ]; then - ipv6_log $"Given IPv6 default gateway '$address' is link-local, but no scope or gateway device is specified" err $fn + net_log $"Given IPv6 default gateway '$address' is link-local, but no scope or gateway device is specified" err $fn return 3 fi fi @@ -1045,16 +892,16 @@ ipv6_set_default_route() { local result=$? if [ $result = 0 ]; then - ipv6_log $"Given IPv6 default device '$device' requires an explicit nexthop" err $fn + net_log $"Given IPv6 default device '$device' requires an explicit nexthop" err $fn return 3 elif [ $result != 10 ]; then - ipv6_log $"Given IPv6 default device '$device' doesn't exist or isn't up" err $fn + net_log $"Given IPv6 default device '$device' doesn't exist or isn't up" err $fn return 3 fi ipv6_add_route ::/0 :: $device else - ipv6_log $"No parameters given to setup a default route" err $fn + net_log $"No parameters given to setup a default route" err $fn return 3 fi @@ -1071,7 +918,7 @@ ipv6_test_route_requires_next_hop() { local device=$1 if [ -z "$device" ]; then - ipv6_log $"Missing parameter 'device' (arg 1)" err $fn + net_log $"Missing parameter 'device' (arg 1)" err $fn return 1 fi @@ -1109,12 +956,12 @@ ipv6_trigger_radvd() { local pidfile=$3 if [ -z "$reason" ]; then - ipv6_log $"No reason given for sending trigger to radvd" err $fn + net_log $"No reason given for sending trigger to radvd" err $fn return 1 fi if [ "$reason" != "up" -a "$reason" != "down" ]; then - ipv6_log $"Unsupported reason '$reason' for sending trigger to radvd" err $fn + net_log $"Unsupported reason '$reason' for sending trigger to radvd" err $fn return 1 fi @@ -1143,7 +990,7 @@ ipv6_trigger_radvd() { local action="$mechanism" ;; *) - ipv6_log $"Unsupported mechanism '$mechanism' for sending trigger to radvd" err $fn + net_log $"Unsupported mechanism '$mechanism' for sending trigger to radvd" err $fn return 3 ;; esac @@ -1155,7 +1002,7 @@ ipv6_trigger_radvd() { # be quiet because triggering may have been disabled true else - ipv6_log $"Given pidfile '$pidfile' doesn't exist, cannot send trigger to radvd" err $fn + net_log $"Given pidfile '$pidfile' doesn't exist, cannot send trigger to radvd" err $fn fi return 3 fi @@ -1164,7 +1011,7 @@ ipv6_trigger_radvd() { local pid="$(cat $pidfile)" if [ -z "$pid" ]; then # pidfile empty - strange - ipv6_log $"Pidfile '$pidfile' is empty, cannot send trigger to radvd" err $fn + net_log $"Pidfile '$pidfile' is empty, cannot send trigger to radvd" err $fn return 3 fi fi @@ -1181,7 +1028,7 @@ ipv6_trigger_radvd() { # be quiet because triggering may have been disabled true else - ipv6_log $"radvd not (properly) installed, triggering failed" err $fn + net_log $"radvd not (properly) installed, triggering failed" err $fn fi return 3 else -- cgit v1.2.1 From 8fc0f2605f4746c879b21d40d31b256e5775b682 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 14:34:12 +0200 Subject: ifup-eth: use /run/initramfs rather then /dev/.run/initramfs --- sysconfig/network-scripts/ifup-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index b81234d2..15ec66c5 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -178,7 +178,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then DHCLIENTCONF=''; fi; # copy any lease obtained by the initrd - for file in /dev/.dhclient-${DEVICE}.leases /dev/{.run/initramfs,.initramfs}/net.${DEVICE}.lease ; do + for file in /dev/.dhclient-${DEVICE}.leases /dev/.initramfs/net.${DEVICE}.lease /run/initramfs/net.${DEVICE}.lease; do if [ -f "${file}" ]; then mv -f $file /var/lib/dhclient/dhclient-${DEVICE}.leases [ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${DEVICE}.leases > /dev/null 2>&1 -- cgit v1.2.1 From b3992eae03af46aefad352d746f32c39f95f6ce3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 16:34:04 -0400 Subject: Add an error when setting gateway fails. (#672202) --- sysconfig/network-scripts/ifup-eth | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 15ec66c5..79669c0c 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -278,10 +278,12 @@ else if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${netmask[0]} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then ip route replace default ${METRIC:+metric $METRIC} \ via ${GATEWAY} ${WINDOW:+window $WINDOW} ${SRC} \ - ${GATEWAYDEV:+dev $GATEWAYDEV} + ${GATEWAYDEV:+dev $GATEWAYDEV} || + net_log $"Error adding default gateway ${GATEWAY} for ${DEVICE}." elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then ip route replace default ${METRIC:+metric $METRIC} \ - ${SRC} ${WINDOW:+window $WINDOW} dev ${REALDEVICE} + ${SRC} ${WINDOW:+window $WINDOW} dev ${REALDEVICE} || + net_log $"Erorr adding default gateway for ${REALDEVICE}." fi fi fi -- cgit v1.2.1 From 537693ee3978120e6259bc568cdce215ccaf72a5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 16:38:07 -0400 Subject: 9.28-1 --- initscripts.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index c7d7fbe8..5eca3590 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.27 +Version: 9.28 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -312,6 +312,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Mar 25 2011 Bill Nottingham - 9.28-1 +- add some generic network logging, port scripts to it (#507515, #653630) +- add an error when setting the gateway fails (#672202) + * Thu Mar 17 2011 Bill Nottingham - 9.27-1 - init.d/functions: fix mishandled argument to fstab-decode. (#685137) - support ipv6 routing rules, merge route/rule code (#680872, ) -- cgit v1.2.1 From ae1353b8528561a41fe82314f3ee010a82e6da7a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 30 Mar 2011 12:31:14 -0400 Subject: Don't print errors if mdadm isn't installed. (#692187) --- rc.d/init.d/netfs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 77a0a68d..6bb149f6 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -43,8 +43,8 @@ case "$1" in [ -n "$NCPFSTAB" ] && action $"Mounting NCP filesystems: " mount -a -t ncpfs [ -n "$NETDEVFSTAB" ] && { - if [ -f /etc/mdadm.conf ]; then - mdadm -A -s + if [ -f /etc/mdadm.conf ] && [ -x /sbin/mdadm ]; then + /sbin/mdadm -A -s fi if [ -f /etc/multipath.conf ] && [ -x /sbin/multipath ]; then modprobe dm-multipath >/dev/null 2>&1 -- cgit v1.2.1 From e922bebb5a023b7a627fa14d5a4d58e6a0cca527 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 30 Mar 2011 12:50:03 -0400 Subject: Document NM_CONTROLLED. (#692123) --- sysconfig.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sysconfig.txt b/sysconfig.txt index 21835e90..58a37e1a 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -593,6 +593,9 @@ Files in /etc/sysconfig/network-scripts/ the default route. DHCLIENTARGS= Any additional arguments to dhclient. + NM_CONTROLLED=yes|no + If set to 'no', NetworkManager will ignore this connection/device. + Defaults to 'yes'. If BOOTPROTO is not "none", then the only other item that must be set is the DEVICE item; all the rest will be determined -- cgit v1.2.1 From d36934846ae17b0362a65b87ab51525b76619ae7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 30 Mar 2011 15:02:59 -0400 Subject: Don't explictly disallow IPv6 aliases (#583409, #612877.) --- sysconfig/network-scripts/ifdown-ipv6 | 3 +-- sysconfig/network-scripts/ifup-ipv6 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6 index 51c4028f..7bfcfb34 100755 --- a/sysconfig/network-scripts/ifdown-ipv6 +++ b/sysconfig/network-scripts/ifdown-ipv6 @@ -45,9 +45,8 @@ CONFIG=$1 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG source_config -# IPv6 don't need aliases anymore, config is skipped REALDEVICE=${DEVICE%%:*} -[ "$DEVICE" != "$REALDEVICE" ] && exit 0 +DEVICE=$REALDEVICE [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 . /etc/sysconfig/network-scripts/network-functions-ipv6 diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index 478682fb..331073ad 100755 --- a/sysconfig/network-scripts/ifup-ipv6 +++ b/sysconfig/network-scripts/ifup-ipv6 @@ -62,9 +62,8 @@ CONFIG=$1 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG source_config -# IPv6 don't need aliases anymore, config is skipped REALDEVICE=${DEVICE%%:*} -[ "$DEVICE" != "$REALDEVICE" ] && exit 0 +DEVICE=$REALDEVICE # Test whether IPv6 configuration is enabled for this interface, else stop [ "$IPV6INIT" = "yes" ] || exit 0 -- cgit v1.2.1 From bbeaaf153d9feb059f658aab0c59a865856ff407 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 30 Mar 2011 16:12:19 -0400 Subject: crypttab should be 0600. --- initscripts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/initscripts.spec b/initscripts.spec index 5eca3590..1785b28d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -125,6 +125,7 @@ rm -f \ %endif touch $RPM_BUILD_ROOT/etc/crypttab +chmod 600 $RPM_BUILD_ROOT/etc/crypttab %pre /usr/sbin/groupadd -g 22 -r -f utmp -- cgit v1.2.1 From 93d8f7b7d63689e9244d1ce942997c0e32bdd7cb Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 4 Apr 2011 09:56:57 +0200 Subject: let systemd check the conditions for fedora-autorelabel The service unit file already checks whether /.autorelabel or the "autorelabel" parameter are present. No need to recheck in the script. Using the new "ConditionSecurity=" feature systemd can also check whether SELinux is enabled. --- systemd/fedora-autorelabel | 21 +++------------------ systemd/system/fedora-autorelabel.service | 1 + 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 326837b2..d83040a3 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -8,17 +8,6 @@ PLYMOUTH= [ -x /usr/bin/plymouth ] && PLYMOUTH=yes -# Check SELinux status -SELINUX_STATE= -if [ -e "/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then - if [ -r "/selinux/enforce" ] ; then - SELINUX_STATE=$(cat "/selinux/enforce") - else - # assume enforcing if you can't read it - SELINUX_STATE=1 - fi -fi - relabel_selinux() { # if /sbin/init is not labeled correctly this process is running in the # wrong context, so a reboot will be required after relabel @@ -47,14 +36,10 @@ relabel_selinux() { systemctl --force reboot } -[ -z "${cmdline}" ] && cmdline=$(cat /proc/cmdline) - # Check to see if a full relabel is needed -if [ -n "$SELINUX_STATE" -a "$READONLY" != "yes" ]; then - if strstr "$cmdline" autorelabel || [ -f /.autorelabel ] ; then - restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1 - relabel_selinux - fi +if [ "$READONLY" != "yes" ]; then + restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1 + relabel_selinux else if [ "$READONLY" != "yes" ] && [ -d /etc/selinux ]; then [ -f /.autorelabel ] || touch /.autorelabel diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service index cd6a84b3..c98a40ff 100644 --- a/systemd/system/fedora-autorelabel.service +++ b/systemd/system/fedora-autorelabel.service @@ -5,6 +5,7 @@ Requires=local-fs.target Conflicts=shutdown.target After=local-fs.target Before=sysinit.target shutdown.target +ConditionSecurity=selinux ConditionKernelCommandLine=|autorelabel ConditionPathExists=|/.autorelabel -- cgit v1.2.1 From 4c34204a40e0369442adb9e595ee3d5df5c1bb3f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 4 Apr 2011 09:57:02 +0200 Subject: simplify the check for plymouth in fedora-autorelabel The result of the check is needed only once, so there's no advantage in caching it in a variable. --- systemd/fedora-autorelabel | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index d83040a3..204c5761 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -5,16 +5,13 @@ . /etc/init.d/functions -PLYMOUTH= -[ -x /usr/bin/plymouth ] && PLYMOUTH=yes - relabel_selinux() { # if /sbin/init is not labeled correctly this process is running in the # wrong context, so a reboot will be required after relabel AUTORELABEL= . /etc/selinux/config echo "0" > /selinux/enforce - [ -n "$PLYMOUTH" ] && plymouth --hide-splash + [ -x /usr/bin/plymouth ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then echo -- cgit v1.2.1 From d88e9d09a6570fe729735740a966ed758ff81141 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 4 Apr 2011 09:57:08 +0200 Subject: separate "touch /.autorelabel" to a new unit Writing /.autorelabel from fedora-autorelabel does not work because the script is executed only if relabel was already requested. Create a new unit fedora-autorelabel-mark.service which will be responsible for creating /.autorelabel if SELinux is disabled. The unit takes advantage of the new "ConditionSecurity=" support in systemd. The old script checked for a read-only filesystem first. The new unit does not do that. If / is read-only, touch will simply fail. This should not be considered as a failure of the unit, so "-" is used in ExecStart. There have been arguments on systemd-devel that the root directory should not be abused for flag files like /.autorelabel. It has a long tradition in Fedora though (since 2005). Maybe we can change it eventually, but let's keep it where it is for now. --- Makefile | 1 + systemd/fedora-autorelabel | 4 ---- systemd/system/fedora-autorelabel-mark.service | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 systemd/system/fedora-autorelabel-mark.service diff --git a/Makefile b/Makefile index a788e0ae..39dd84e2 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,7 @@ install: ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autoswap.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants + ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-sysinit-hack.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 204c5761..dad7a91f 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -37,8 +37,4 @@ relabel_selinux() { if [ "$READONLY" != "yes" ]; then restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1 relabel_selinux -else - if [ "$READONLY" != "yes" ] && [ -d /etc/selinux ]; then - [ -f /.autorelabel ] || touch /.autorelabel - fi fi diff --git a/systemd/system/fedora-autorelabel-mark.service b/systemd/system/fedora-autorelabel-mark.service new file mode 100644 index 00000000..33b5147b --- /dev/null +++ b/systemd/system/fedora-autorelabel-mark.service @@ -0,0 +1,15 @@ +[Unit] +Description=Mark the need to relabel after reboot +DefaultDependencies=no +Requires=local-fs.target +Conflicts=shutdown.target +After=local-fs.target +Before=sysinit.target shutdown.target +ConditionSecurity=!selinux +ConditionPathIsDirectory=/etc/selinux +ConditionPathExists=!/.autorelabel + +[Service] +ExecStart=-/bin/touch /.autorelabel +Type=oneshot +RemainAfterExit=yes -- cgit v1.2.1 From 3ffdab1c50ba631e0e706fb44e8b3708574aa11d Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 4 Apr 2011 09:57:13 +0200 Subject: bump the required systemd version in the .spec "ConditionSecurity=selinux" will be supported in systemd-23. --- initscripts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 1785b28d..674badfd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -27,8 +27,8 @@ Requires: upstart-sysvinit %endif %endif %if %{_with_systemd} -Conflicts: systemd < 12-1 -Conflicts: systemd-units < 12-1 +Conflicts: systemd < 23-1 +Conflicts: systemd-units < 23-1 %if ! %{_with_upstart} Requires: systemd-sysvinit %endif -- cgit v1.2.1 From 8df4ee072641b1153852c8b8b778ef4a02edb8bd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 6 Apr 2011 15:47:46 -0400 Subject: Add a storage setup after cryptsetup.target. (#692198) Due to cryptsetup being parallel with this initially, we need this to support LVM/MD on LUKS. --- systemd/system/fedora-storage-init-late.service | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 systemd/system/fedora-storage-init-late.service diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service new file mode 100644 index 00000000..80bba21f --- /dev/null +++ b/systemd/system/fedora-storage-init-late.service @@ -0,0 +1,13 @@ +[Unit] +Description=Initialize storage subsystems (RAID, LVM, etc.) +DefaultDependencies=no +Conflicts=shutdown.target +After=cryptsetup.target +Before=local-fs.target shutdown.target +Wants=fedora-wait-storage.service + +[Service] +ExecStart=/lib/systemd/fedora-storage-init +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes -- cgit v1.2.1 From 5ad0de2a6ea61d3bc6c6991227c92862dc83cd58 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 6 Apr 2011 16:22:13 -0400 Subject: 9.29-1 --- initscripts.spec | 9 ++++++++- po/eu_ES.po | 2 +- po/hy.po | 2 +- po/ku.po | 2 +- po/lo.po | 2 +- po/my.po | 2 +- po/si.po | 4 ++-- po/sq.po | 2 +- po/wa.po | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 674badfd..78444409 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.28 +Version: 9.29 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -313,6 +313,13 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Apr 06 2011 Bill Nottingham - 9.29-1 +- systemd: add a storage setup service after cryptsetup.target (#692198) +- fix /.autorelabel handling () +- don't explicitly disallow IPv6 aliases (#583409, #612877) +- netfs: don't print errors if mdadm isn't installed. (#692187) +- ifup-eth: use /run/initramfs rather then /dev/.run/initramfs () + * Fri Mar 25 2011 Bill Nottingham - 9.28-1 - add some generic network logging, port scripts to it (#507515, #653630) - add an error when setting the gateway fails (#672202) diff --git a/po/eu_ES.po b/po/eu_ES.po index be5f7762..a1e98f69 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"PO-Revision-Date: 2011-04-06 19:57+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/po/hy.po b/po/hy.po index 627c69fe..d6729967 100644 --- a/po/hy.po +++ b/po/hy.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"PO-Revision-Date: 2011-04-06 19:56+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/po/ku.po b/po/ku.po index bbe1d98a..62175ea7 100644 --- a/po/ku.po +++ b/po/ku.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"PO-Revision-Date: 2011-04-06 19:56+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/po/lo.po b/po/lo.po index 24b6d3a7..b9ca0fe5 100644 --- a/po/lo.po +++ b/po/lo.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"PO-Revision-Date: 2011-04-06 19:56+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/po/my.po b/po/my.po index 120b8087..6dacb5e1 100644 --- a/po/my.po +++ b/po/my.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"PO-Revision-Date: 2011-04-06 19:57+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/po/si.po b/po/si.po index 59864e92..8f92ccf7 100644 --- a/po/si.po +++ b/po/si.po @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"PO-Revision-Date: 2011-04-06 19:57+0000\n" "Last-Translator: \n" -"Language-Team: \n" +"Language-Team: Sinhala \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" diff --git a/po/sq.po b/po/sq.po index bdb076e7..a249ef2e 100644 --- a/po/sq.po +++ b/po/sq.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:19+0000\n" +"PO-Revision-Date: 2011-04-06 19:56+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/po/wa.po b/po/wa.po index 6ea3b26b..379a01fd 100644 --- a/po/wa.po +++ b/po/wa.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-03-03 19:18+0000\n" +"PO-Revision-Date: 2011-04-06 19:56+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" -- cgit v1.2.1 From 3de0e06afda2e572d0952941498446fdda7f3f42 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 7 Apr 2011 11:29:10 -0400 Subject: Make sure the bond exists when we bring up the slaves. (#694501) --- sysconfig/network-scripts/ifup-eth | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 79669c0c..836243a0 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -94,7 +94,8 @@ is_wireless_device ${DEVICE} && . ./ifup-wireless # slave device? if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then - grep -wq "${DEVICE}" /sys/class/net/${MASTER}/bonding/slaves || { + install_bonding_driver ${MASTER} + grep -wq "${DEVICE}" /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null || { /sbin/ip link set dev ${DEVICE} down echo "+${DEVICE}" > /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null } -- cgit v1.2.1 From 5749d2e9d5795fdaf65b97befd64cf90103d423d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 12 Apr 2011 14:28:39 +0200 Subject: ifup/ifdown-eth: properly add and remove arp_ip_target's Only add arp_ip_target, if not yet present. Only remove arp_ip_target, if present in BONDING_OPTS, to prevent clash with module options. https://bugzilla.redhat.com/show_bug.cgi?id=604669 --- sysconfig/network-scripts/ifdown-eth | 21 +++++++++++++++++++-- sysconfig/network-scripts/ifup-eth | 10 ++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 80b99544..2bc976de 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -57,8 +57,25 @@ if is_bonding_device ${DEVICE} ; then is_ignored_file "$device" && continue /sbin/ifdown ${device##*/} done - for target in $(cat /sys/class/net/${DEVICE}/bonding/arp_ip_target) ; do - echo "-${target}" > /sys/class/net/${DEVICE}/bonding/arp_ip_target + for arg in $BONDING_OPTS ; do + key=${arg%%=*}; + [[ "${key}" != "arp_ip_target" ]] || continue + value=${arg##*=}; + if [ "${value:0:1}" != "" ]; then + OLDIFS=$IFS; + IFS=','; + for arp_ip in $value; do + if grep -q $arp_ip /sys/class/net/${DEVICE}/bonding/arp_ip_target; then + echo "-$arp_ip" > /sys/class/net/${DEVICE}/bonding/arp_ip_target + fi + done + IFS=$OLDIFS; + else + value=${value#}; + if grep -q $value /sys/class/net/${DEVICE}/bonding/arp_ip_target; then + echo "-$value" > /sys/class/net/${DEVICE}/bonding/arp_ip_target + fi + fi done fi diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 836243a0..469a07fa 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -120,10 +120,16 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then OLDIFS=$IFS; IFS=','; for arp_ip in $value; do - echo +$arp_ip > /sys/class/net/${DEVICE}/bonding/$key + if ! grep -q $arp_ip /sys/class/net/${DEVICE}/bonding/$key; then + echo +$arp_ip > /sys/class/net/${DEVICE}/bonding/$key + fi done IFS=$OLDIFS; - else + elif [ "${key}" = "arp_ip_target" ]; then + if ! grep -q ${value#+} /sys/class/net/${DEVICE}/bonding/$key; then + echo "$value" > /sys/class/net/${DEVICE}/bonding/$key + fi + else echo $value > /sys/class/net/${DEVICE}/bonding/$key fi done -- cgit v1.2.1 From b24d6b8667ccd7b764d540a623b800a2411ad8a8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Apr 2011 09:49:41 -0400 Subject: Fix patch misapplication --- sysconfig/network-scripts/ifdown-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 2bc976de..17386a71 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -71,7 +71,7 @@ if is_bonding_device ${DEVICE} ; then done IFS=$OLDIFS; else - value=${value#}; + value=${value#+}; if grep -q $value /sys/class/net/${DEVICE}/bonding/arp_ip_target; then echo "-$value" > /sys/class/net/${DEVICE}/bonding/arp_ip_target fi -- cgit v1.2.1 From 77977daabdb09b5dac49e6f5b733527f60cafe6a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Apr 2011 11:02:34 -0400 Subject: Fix index handling for expanded configs --- sysconfig/network-scripts/network-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 8d92d081..6224f0c9 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -161,7 +161,7 @@ expand_config () for idx in '' {0..255} ; do ipaddr[$i]=$(eval echo '$'IPADDR$idx) if [ -z "${ipaddr[$i]}" ]; then - [ "$idx" ] && [ $idx -gt 2 ] && break + [ "$idx" ] && [ $idx -ge 2 ] && break continue fi prefix[$i]=$(eval echo '$'PREFIX$idx) -- cgit v1.2.1 From b4bdede8b55b39467ee96da8d4e72dadd4e269ba Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 18 Apr 2011 13:58:56 -0400 Subject: Exclude single init.d file that's overriden by systemd. (#697535) --- initscripts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/initscripts.spec b/initscripts.spec index 78444409..be691f57 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -245,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT /etc/rc.d/init.d/* %exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/reboot +%exclude /etc/rc.d/init.d/single %config(noreplace) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf %exclude /etc/profile.d/debug* -- cgit v1.2.1 From 3c38f904f831f02d5f5c28f431ca86d9877697f1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 18 Apr 2011 14:16:08 -0400 Subject: Support overriding hostname via /etc/hostname. --- rc.d/rc.sysinit | 3 +++ sysconfig.txt | 1 + systemd/fedora-configure | 1 + 3 files changed, 5 insertions(+) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 6067ea88..561e99e8 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -12,6 +12,9 @@ set -m if [ -f /etc/sysconfig/network ]; then . /etc/sysconfig/network fi +if [ -r /etc/hostname ]; then + HOSTNAME=$(cat /etc/hostname) +fi if [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; then HOSTNAME=localhost fi diff --git a/sysconfig.txt b/sysconfig.txt index 58a37e1a..6a3c3b57 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -186,6 +186,7 @@ Generic options: NETWORKING=yes|no HOSTNAME= + Note that this can be overriden by /etc/hostname. GATEWAY= GATEWAYDEV= (e.g. eth0) NISDOMAIN= diff --git a/systemd/fedora-configure b/systemd/fedora-configure index e6779fed..d1e4dbd3 100755 --- a/systemd/fedora-configure +++ b/systemd/fedora-configure @@ -15,6 +15,7 @@ fi # Reread in network configuration data. if [ -f /etc/sysconfig/network ]; then . /etc/sysconfig/network + [ -r /etc/hostname ] && HOSTNAME=$(cat /etc/hostname) # Reset the hostname. action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME} -- cgit v1.2.1 From c145e815bcfad7f35fb1b53cdea2d0f66c1fd4e2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 25 Apr 2011 14:40:08 -0400 Subject: Fix logic error (#698520, ) --- rc.d/rc.sysinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 561e99e8..09f93b32 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -330,7 +330,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then ipaddr=$(ip addr show to 0.0.0.0/0 scope global | awk '/[[:space:]]inet / { print gensub("/.*","","g",$2) }') for ip in $ipaddr ; do HOSTNAME= - eval $(ipcalc -h $ipaddr 2>/dev/null) + eval $(ipcalc -h $ip 2>/dev/null) [ -n "$HOSTNAME" ] && { hostname ${HOSTNAME} ; break; } done fi -- cgit v1.2.1 From d6e771ee267778ab76685c3454b983697bc46ffe Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 26 Apr 2011 16:20:40 -0400 Subject: Tweak how plymouth is quit in the gdm case. () --- prefdm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/prefdm b/prefdm index 63fb39e3..b4d64246 100755 --- a/prefdm +++ b/prefdm @@ -6,31 +6,31 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n # Run preferred X display manager -quit_arg= preferred= +splash_quit_command="" if [ -f /etc/sysconfig/desktop ]; then . /etc/sysconfig/desktop if [ "$DISPLAYMANAGER" = GNOME ]; then preferred=/usr/sbin/gdm - quit_arg="--retain-splash" elif [ "$DISPLAYMANAGER" = KDE ]; then preferred=/usr/bin/kdm - quit_arg="--retain-splash" + + # KDM supports "old-style" transition + splash_quit_command="plymouth quit --retain-splash" elif [ "$DISPLAYMANAGER" = WDM ]; then preferred=/usr/bin/wdm + splash_quit_command="plymouth quit" elif [ "$DISPLAYMANAGER" = XDM ]; then preferred=/usr/bin/xdm + splash_quit_command="plymouth quit" elif [ -n "$DISPLAYMANAGER" ]; then preferred=$DISPLAYMANAGER - else - quit_arg="--retain-splash" + splash_quit_command="plymouth quit" fi -else - quit_arg="--retain-splash" fi # shut down boot splash -/usr/bin/plymouth quit $quit_arg +$splash_quit_command shopt -s execfail -- cgit v1.2.1 From ef25e0519aa39cb7a860185e55607ceefa299749 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 10:59:40 -0400 Subject: KDM can handle plymouth itself as well. --- prefdm | 3 --- 1 file changed, 3 deletions(-) diff --git a/prefdm b/prefdm index b4d64246..bab1b065 100755 --- a/prefdm +++ b/prefdm @@ -14,9 +14,6 @@ if [ -f /etc/sysconfig/desktop ]; then preferred=/usr/sbin/gdm elif [ "$DISPLAYMANAGER" = KDE ]; then preferred=/usr/bin/kdm - - # KDM supports "old-style" transition - splash_quit_command="plymouth quit --retain-splash" elif [ "$DISPLAYMANAGER" = WDM ]; then preferred=/usr/bin/wdm splash_quit_command="plymouth quit" -- cgit v1.2.1 From b15a418b0ab137507d8e96d4b35d6ff7db76ee8f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 13:05:37 -0400 Subject: Make sure to enable fedora-storage-init-late.service, and have it after the non-late version. (#699918) --- Makefile | 1 + systemd/system/fedora-storage-init-late.service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 39dd84e2..718b451e 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,7 @@ install: ln -s ../fedora-sysinit-hack.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants + ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants mkdir -p $(ROOT)/etc/tmpfiles.d diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service index 80bba21f..bfd4b73b 100644 --- a/systemd/system/fedora-storage-init-late.service +++ b/systemd/system/fedora-storage-init-late.service @@ -2,7 +2,7 @@ Description=Initialize storage subsystems (RAID, LVM, etc.) DefaultDependencies=no Conflicts=shutdown.target -After=cryptsetup.target +After=cryptsetup.target fedora-storage-init.service Before=local-fs.target shutdown.target Wants=fedora-wait-storage.service -- cgit v1.2.1 From 318d859b9df0131a80cdfa7b6a12066bd5212965 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 13:10:34 -0400 Subject: Handle IPADDRx correctly for static addresses (#698738) --- sysconfig/network-scripts/ifup-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 469a07fa..764d27a2 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -211,7 +211,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then fi # end dynamic device configuration else - if [ -z "${IPADDR}" ]; then + if [ -z "${IPADDR}" -a -z "${IPADDR0}" -a -z "${IPADDR1}" -a -z "${IPADDR2}" ]; then # enable device without IP, useful for e.g. PPPoE ip link set dev ${REALDEVICE} up if [ -n "$ETHTOOL_OPTS" ] ; then -- cgit v1.2.1 From c59124e60fdebd8db74be5a4747f4ef623255ffe Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 13:17:10 -0400 Subject: 9.30-1 --- initscripts.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index be691f57..858afd10 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.29 +Version: 9.30 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -314,6 +314,16 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Apr 27 2011 Bill Nottingham - 9.30-1 +- ifup-eth: handle IPADDRx correctly for static addresses (#697838) +- systemd: fix storage setup service after cryptsetup.target (#699918) +- prefdm: tweak how plymouth is quit in the gdm/kdm case () +- support /etc/hostname as an override for hostname in /etc/sysconfig/network +- init.d/single: only ship this in -legacy +- network-functions: fix IPADDRx index handling () +- ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, ) +- ifup-eth: ensure bond exists before bringing up slaves (#694501) + * Wed Apr 06 2011 Bill Nottingham - 9.29-1 - systemd: add a storage setup service after cryptsetup.target (#692198) - fix /.autorelabel handling () -- cgit v1.2.1 From 046a3ba411cc66eefcfe7d9a598e7960784e18e9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 15:31:11 -0400 Subject: Don't redirect to systemctl, as 'start' in that case won't try to start it again. --- NetworkManager/dispatcher.d/05-netfs | 1 + 1 file changed, 1 insertion(+) diff --git a/NetworkManager/dispatcher.d/05-netfs b/NetworkManager/dispatcher.d/05-netfs index 655c87aa..bd558464 100755 --- a/NetworkManager/dispatcher.d/05-netfs +++ b/NetworkManager/dispatcher.d/05-netfs @@ -1,6 +1,7 @@ #!/bin/sh export LC_ALL=C +export SYSTEMCTL_SKIP_REDIRECT=1 if [ "$2" = "down" ]; then /sbin/ip route ls | grep -q ^default || { -- cgit v1.2.1 From a8295afa615410bfef2df178ab8764cdc25bf2e0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 9 May 2011 12:36:45 -0400 Subject: don't match filesystem types in hostnames (#703203, ) --- rc.d/init.d/halt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index cb33cbed..267a7c83 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -140,7 +140,8 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \ LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/sys\/fs\/cgroup|^\/dev/{next} $3 == "tmpfs" || $3 == "proc" {print $2 ; next} - /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next} + $3 ~ /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs)/ {next} + /(^none|^\/dev\/ram|^\/dev\/root$)/ {next} {print $2}' /proc/mounts \ $"Unmounting file systems: " \ $"Unmounting file systems (retry): " \ -- cgit v1.2.1 From 81b50ecb6be1df83b45c6ed868e855c6d11bf135 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 10 May 2011 15:02:47 -0400 Subject: fuser -k defaults to -9; set the initial pass to kill -15. (#703457) --- rc.d/init.d/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index ec4f2bbe..8a3177a1 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -128,7 +128,7 @@ __fgrep() { # awk_program should process fstab_file and return a list of fstab-encoded # paths; it doesn't have to handle comments in fstab_file. __umount_loop() { - local remaining sig= + local remaining sig=-15 local retry=3 count remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r) @@ -156,7 +156,7 @@ __umount_loop() { # Similar to __umount loop above, specialized for loopback devices __umount_loopback_loop() { - local remaining devremaining sig= + local remaining devremaining sig=-15 local retry=3 remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts) -- cgit v1.2.1 From 7bbed9542c60bdece7d86460dff16ce0f4a1ae26 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 10 May 2011 15:11:07 -0400 Subject: Use LC_ALL=C when calling sed. (https://bugs.mageia.org/show_bug.cgi?id=1216, via ) --- rc.d/init.d/network | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rc.d/init.d/network b/rc.d/init.d/network index dd4e7700..ac30b8f3 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -44,11 +44,11 @@ cd /etc/sysconfig/network-scripts # find all the interfaces besides loopback. # ignore aliases, alternative configurations, and editor backup files interfaces=$(ls ifcfg* | \ - LANG=C sed -e "$__sed_discard_ignored_files" \ + LC_ALL=C sed -e "$__sed_discard_ignored_files" \ -e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \ -e '/ifcfg-[A-Za-z0-9#\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ - LANG=C sort -k 1,1 -k 2n | \ - LANG=C sed 's/ //') + LC_ALL=C sort -k 1,1 -k 2n | \ + LC_ALL=C sed 's/ //') rc=0 # See how we were called. -- cgit v1.2.1 From caca80528ead03919e6157ccd2bdffff37e2dbad Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 10 May 2011 15:13:27 -0400 Subject: Tweak wording, as other scripts with S99 priority may actually run later. (#703148) --- rc.d/rc.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/rc.local b/rc.d/rc.local index 0036e6c5..c6a8faf1 100755 --- a/rc.d/rc.local +++ b/rc.d/rc.local @@ -1,6 +1,6 @@ #!/bin/sh # -# This script will be executed *after* all the other init scripts. +# This script will be executed at the end of the boot process. # You can put your own initialization stuff in here if you don't # want to do the full Sys V style init stuff. -- cgit v1.2.1 From 96543426898ebd6d7158a88ce4c42184a7d01169 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 12 May 2011 14:00:46 -0400 Subject: VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475) --- rc.d/init.d/network | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rc.d/init.d/network b/rc.d/init.d/network index ac30b8f3..b3dbe7a6 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -98,6 +98,10 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi + if [ "$SLAVE" = "yes" ]; then + continue + fi + if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then vpninterfaces="$vpninterfaces $i" continue @@ -121,10 +125,6 @@ case "$1" in continue fi - if [ "$SLAVE" = "yes" ]; then - continue - fi - if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then # this loads the module, to preserve ordering is_available $i -- cgit v1.2.1 From f39db247a18f5c3ac465130b1ac7cd13f1294693 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 17 May 2011 14:21:05 -0400 Subject: Exclude single symlink as well. (#705457) --- initscripts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/initscripts.spec b/initscripts.spec index 858afd10..e19e2d83 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -245,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT /etc/rc.d/init.d/* %exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/reboot +%exclude /etc/rc.d/rc[0-9].d/*single %exclude /etc/rc.d/init.d/single %config(noreplace) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf -- cgit v1.2.1 From 1019b73ba59dd0b842550eb79aef7c4ae8d1dce2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 18 May 2011 12:47:06 -0400 Subject: Override NETMASK from PREFIX where specified (#705367, ) --- sysconfig/network-scripts/network-functions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 6224f0c9..5815eaa9 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -168,6 +168,11 @@ expand_config () netmask[$i]=$(eval echo '$'NETMASK$idx) broadcast[$i]=$(eval echo '$'BROADCAST$idx) + if [ "${prefix[$i]}x" != "x" ]; then + val=$(/bin/ipcalc --netmask "${ipaddr[$i]}/${prefix[$i]}") + netmask[$i]=${val##NETMASK=} + fi + if [ "${netmask[$i]}x" = "x" ]; then val=$(/bin/ipcalc --netmask "${ipaddr[$i]}") netmask[$i]=${val##NETMASK=} -- cgit v1.2.1 From 60ddb21fcdfb0594a35978aa0b04af4527c46d6e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 31 May 2011 17:35:33 -0400 Subject: Ensure DHCP_HOSTNAME is a short hostname, seed it from HOSTNAME if needed. (#697877) --- sysconfig/network-scripts/ifup-eth | 4 ++-- sysconfig/network-scripts/network-functions | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 764d27a2..f46a8843 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -191,7 +191,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then [ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${DEVICE}.leases > /dev/null 2>&1 fi done - DHCLIENTARGS="${DHCLIENTARGS} ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" echo echo -n $"Determining IP information for ${DEVICE}..." if [[ "${PERSISTENT_DHCLIENT}" != [yY1]* ]] && check_link_down ${DEVICE}; then @@ -304,7 +304,7 @@ fi # IPv6 initialisation? /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhclient ]; then - /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE} + /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE} fi if [ "${IPX}" = yes ]; then diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 5815eaa9..2d3263a2 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -190,6 +190,8 @@ expand_config () i=$((i+1)) done + [ -n "$DHCP_HOSTNAME" ] && DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*} + if [ -z "${NETWORK}" ]; then eval $(/bin/ipcalc --network ${ipaddr[0]} ${netmask[0]}) fi -- cgit v1.2.1 From 56ac215dd147c559558009ca899dc33d9932dce2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 2 Jun 2011 11:23:14 -0400 Subject: Clean up some noise if stderr isn't available. --- rc.d/init.d/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 8a3177a1..1b0b4843 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -55,9 +55,9 @@ systemctl_redirect () { if [ -z "${CONSOLETYPE:-}" ]; then if [ -r "/dev/stderr" ]; then - CONSOLETYPE="$(/sbin/consoletype < /dev/stderr)" + CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" else - CONSOLETYPE="$(/sbin/consoletype)" + CONSOLETYPE="$(/sbin/consoletype 2>/dev/null)" fi fi -- cgit v1.2.1 From 64abf0d52cf837d348efefbbe4324941058cfb4c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Jun 2011 15:30:10 -0400 Subject: If IPv6 is configured on the alias, configure it. (#583409) --- sysconfig/network-scripts/ifup-aliases | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index 6fa71921..fc21c7b6 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -292,6 +292,8 @@ function new_interface () /sbin/ifconfig ${DEVICE} ${IPADDR} netmask ${NETMASK} broadcast ${BROADCAST} + [ "$IPV6INIT" = "yes" ] && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE} + if [ "$NO_ALIASROUTING" != yes ]; then GATEWAYDEV=$network_GATEWAYDEV; -- cgit v1.2.1 From 95521ae815ae158ddc2d0ed772e189315cb27bb8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 20 Jun 2011 15:42:19 -0400 Subject: Start udev by hand. (#714531) --- rc.d/rc.sysinit | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 09f93b32..e0ce09c8 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -137,7 +137,10 @@ fi nashpid=$(pidof nash 2>/dev/null) [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1 unset nashpid -/sbin/start_udev +/sbin/udevd --daemon +/sbin/udevadm trigger --type=subsystems --action=add +/sbin/udevadm trigger --type=devices --action=add +/sbin/udevadm settle # Load other user-defined modules for file in /etc/sysconfig/modules/*.modules ; do -- cgit v1.2.1 From 2d0e73b65745aa881ff3dca5200d0bece1827e89 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 20 Jun 2011 15:43:25 -0400 Subject: Remove ipsec-tools scripts (they're now in ipsec-tools itself.) --- initscripts.spec | 3 +- sysconfig/network-scripts/ifdown-ipsec | 86 ---------- sysconfig/network-scripts/ifup-ipsec | 279 --------------------------------- 3 files changed, 1 insertion(+), 367 deletions(-) delete mode 100755 sysconfig/network-scripts/ifdown-ipsec delete mode 100755 sysconfig/network-scripts/ifup-ipsec diff --git a/initscripts.spec b/initscripts.spec index e19e2d83..9f1b5d28 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -54,6 +54,7 @@ Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Conflicts: NetworkManager < 1:0.8.0-12.git20100504 +Conflicts: ipsec-tools < 0.8.0-2 Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils @@ -204,8 +205,6 @@ rm -rf $RPM_BUILD_ROOT /etc/sysconfig/network-scripts/ifdown-eth /etc/sysconfig/network-scripts/ifup-ipv6 /etc/sysconfig/network-scripts/ifdown-ipv6 -/etc/sysconfig/network-scripts/ifup-ipsec -/etc/sysconfig/network-scripts/ifdown-ipsec /etc/sysconfig/network-scripts/ifup-sit /etc/sysconfig/network-scripts/ifdown-sit /etc/sysconfig/network-scripts/ifup-tunnel diff --git a/sysconfig/network-scripts/ifdown-ipsec b/sysconfig/network-scripts/ifdown-ipsec deleted file mode 100755 index 85133784..00000000 --- a/sysconfig/network-scripts/ifdown-ipsec +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -PATH=/sbin:/usr/sbin/:/bin:/usr/bin - -cd /etc/sysconfig/network-scripts -. ./network-functions - -CONFIG=$1 -[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1} -source_config - -if [ -n "$KEY_AH" -o -n "$KEY_ESP" ]; then - KEYING=manual -fi - - -if [ -n "$IKE_PSK" ]; then - KEYING=automatic - IKE_METHOD=PSK -fi - -if [ -n "$IKE_CERTFILE" ]; then - KEYING=automatic - IKE_METHOD=X509 -fi - -if [ -n "$IKE_PEER_CERTFILE" ]; then - KEYING=automatic - IKE_METHOD=X509 -fi - -if [ -n "$IKE_DNSSEC" ]; then - KEYING=automatic - IKE_METHOD=X509 -fi -if [ -n "$RSA_KEY" ]; then - KEYING=automatic - IKE_METHOD=RSA -fi - -[ -n "$IKE_METHOD" ] && KEYING=automatic -[ -z "$KEYING" ] && KEYING=manual - -if [ -z "$SRC" ]; then - SRC=$(ip -o route get to $DST | sed "s|.*src \([^ ]*\).*|\1|") -fi - -if [ -n "$SRCNET" -o -n "$DSTNET" ]; then - MODE=tunnel - [ -z "$SRCNET" ] && SRCNET="$SRC/32" - [ -z "$DSTNET" ] && DSTNET="$DST/32" - SPD_SRC=$SRCNET - SPD_DST=$DSTNET - # If SRCNET is a subnet of DSTNET, exclude SRCNET<->SRCNET communication - if [ "${SRCNET##*/}" -gt "${DSTNET##*/}" ] \ - && [ "$(ipcalc -n "${SRCNET%%/*}/${DSTNET##*/}")" \ - = "NETWORK=${DSTNET%%/*}" ]; then - EXCLUDE_SRCNET=yes - fi - [ -z "$SRCGW" ] && SRCGW=$(ip -o route get to $SRCNET | sed "s|.*src \([^ ]*\).*|\1|") - ip route del to $DSTNET via $SRCGW src $SRCGW -else - MODE=transport - SPD_SRC=$SRC - SPD_DST=$DST - unset EXCLUDE_SRCNET -fi - -setkey -c << EOF -${SPI_AH_OUT:+delete $SRC $DST ah $SPI_AH_OUT;} -${SPI_AH_IN:+delete $DST $SRC ah $SPI_AH_IN;} -${SPI_ESP_OUT:+delete $SRC $DST esp $SPI_ESP_OUT;} -${SPI_ESP_IN:+delete $DST $SRC esp $SPI_ESP_IN;} -spddelete $SPD_SRC $SPD_DST any -P out; -spddelete $SPD_DST $SPD_SRC any -P in; -${EXCLUDE_SRCNET:+spddelete $SPD_SRC $SPD_SRC any -P out;} -${EXCLUDE_SRCNET:+spddelete $SPD_SRC $SPD_SRC any -P in;} -EOF - -if [ "$KEYING" = "automatic" -a -n "$IKE_METHOD" ]; then - racoontmp=$(mktemp /etc/racoon/racoon.XXXXXX) - grep -v "^include \"/etc/racoon/$DST.conf\";" /etc/racoon/racoon.conf >> $racoontmp - mv -f $racoontmp /etc/racoon/racoon.conf - pidof -x /usr/sbin/racoon > /dev/null 2>&1 && killall -HUP racoon -fi - -/etc/sysconfig/network-scripts/ifdown-post $CONFIG diff --git a/sysconfig/network-scripts/ifup-ipsec b/sysconfig/network-scripts/ifup-ipsec deleted file mode 100755 index f3da7d4b..00000000 --- a/sysconfig/network-scripts/ifup-ipsec +++ /dev/null @@ -1,279 +0,0 @@ -#!/bin/sh -# -# ifup-ipsec -# -# Brings up ipsec interfaces - -handle_keys() { - [ -z "$KEY_AH_IN" -a -n "$KEY_AH" ] && KEY_AH_IN=$KEY_AH - [ -z "$KEY_AH_OUT" -a -n "$KEY_AH" ] && KEY_AH_OUT=$KEY_AH - [ -z "$KEY_ESP_IN" -a -n "$KEY_ESP" ] && KEY_ESP_IN=$KEY_ESP - [ -z "$KEY_ESP_OUT" -a -n "$KEY_ESP" ] && KEY_ESP_OUT=$KEY_ESP - [ -z "$KEY_AESP_IN" -a -n "$KEY_AESP" ] && KEY_AESP_IN=$KEY_AESP - [ -z "$KEY_AESP_OUT" -a -n "$KEY_AESP" ] && KEY_AESP_OUT=$KEY_AESP - - [ -n "$KEY_AH_IN" -a "$KEY_AH_IN" = "${KEY_AH_IN##0x}" ] \ - && KEY_AH_IN=\"$KEY_AH_IN\" - [ -n "$KEY_AH_OUT" -a "$KEY_AH_OUT" = "${KEY_AH_OUT##0x}" ] \ - && KEY_AH_OUT=\"$KEY_AH_OUT\" - [ -n "$KEY_ESP_IN" -a "$KEY_ESP_IN" = "${KEY_ESP_IN##0x}" ] \ - && KEY_ESP_IN=\"$KEY_ESP_IN\" - [ -n "$KEY_ESP_OUT" -a "$KEY_ESP_OUT" = "${KEY_ESP_OUT##0x}" ] \ - && KEY_ESP_OUT=\"$KEY_ESP_OUT\" - [ -n "$KEY_AESP_IN" -a "$KEY_AESP_IN" = "${KEY_AESP_IN##0x}" ] \ - && KEY_AESP_IN=\"$KEY_AESP_IN\" - [ -n "$KEY_AESP_OUT" -a "$KEY_AESP_OUT" = "${KEY_AESP_OUT##0x}" ] \ - && KEY_AESP_OUT=\"$KEY_AESP_OUT\" -} - -. /etc/init.d/functions -cd /etc/sysconfig/network-scripts -. ./network-functions - -CONFIG=$1 -[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1} -source_config - -handle_keys - -if [ -n "$KEY_AH" -o -n "$KEY_ESP" ]; then - KEYING=manual -fi - - -if [ -n "$IKE_PSK" ]; then - KEYING=automatic - IKE_METHOD=PSK -fi - -if [ -n "$IKE_CERTFILE" ]; then - KEYING=automatic - IKE_METHOD=X509 -fi - -if [ -n "$IKE_PEER_CERTFILE" ]; then - KEYING=automatic - IKE_METHOD=X509 -fi - -if [ -n "$IKE_DNSSEC" ]; then - KEYING=automatic - IKE_METHOD=X509 -fi - -[ -n "$IKE_METHOD" ] && KEYING=automatic -[ -z "$KEYING" ] && KEYING=manual - -if [ -z "$SRC" ]; then - SRC=$(ip -o route get to $DST | sed "s|.*src \([^ ]*\).*|\1|") -fi - -if [ -n "$SRCNET" -o -n "$DSTNET" ]; then - TUNNEL_MODE=yes - MODE=tunnel - [ -z "$SRCNET" ] && SRCNET="$SRC/32" - [ -z "$DSTNET" ] && DSTNET="$DST/32" - SPD_SRC=$SRCNET - SPD_DST=$DSTNET - # If SRCNET is a subnet of DSTNET, exclude SRCNET<->SRCNET communication - if [ "${SRCNET##*/}" -gt "${DSTNET##*/}" ] \ - && [ "$(ipcalc -n "${SRCNET%%/*}/${DSTNET##*/}")" \ - = "NETWORK=${DSTNET%%/*}" ]; then - EXCLUDE_SRCNET=yes - fi - [ -z "$SRCGW" ] && SRCGW=$(ip -o route get to $SRCNET | sed "s|.*src \([^ ]*\).*|\1|") - ip route add to $DSTNET via $SRCGW src $SRCGW -else - unset TUNNEL_MODE - MODE=transport - SPD_SRC=$SRC - SPD_DST=$DST - unset EXCLUDE_SRCNET -fi - -unset SPD_AH_IN SPD_AH_OUT SPD_ESP_IN SPD_ESP_OUT -if [ "$KEYING" = "manual" ]; then - [ -z "$AH_PROTO" ] && AH_PROTO=hmac-sha1 - [ -z "$ESP_PROTO" ] && ESP_PROTO=3des-cbc - [ -z "$AESP_PROTO" ] && AESP_PROTO=hmac-sha1 - - [ -n "$KEY_AH_IN" ] && SPD_AH_IN=yes - [ -n "$KEY_AH_OUT" ] && SPD_AH_OUT=yes - [ -n "$KEY_ESP_IN" ] && SPD_ESP_IN=yes - [ -n "$KEY_ESP_OUT" ] && SPD_ESP_OUT=yes -else - [ -z "$IKE_DHGROUP" ] && IKE_DHGROUP=2 - [ -z "$AH_PROTO" ] && AH_PROTO=sha1 - [ -z "$ESP_PROTO" ] && ESP_PROTO=3des - [ -z "$IKE_AUTH" ] && IKE_AUTH=$AH_PROTO - [ -z "$IKE_ENC" ] && IKE_ENC=$ESP_PROTO - [ "$IKE_AUTH" = "none" ] && IKE_AUTH=sha1 - [ "$IKE_ENC" = "none" ] && IKE_ENC=3des - - SPD_AH_IN=yes - SPD_AH_OUT=yes - SPD_ESP_IN=yes - SPD_ESP_OUT=yes -fi - -if [ "$AH_PROTO" = "none" ]; then - unset SPI_AH_IN SPI_AH_OUT KEY_AH_IN KEY_AH_OUT SPD_AH_IN SPD_AH_OUT -fi -if [ "$ESP_PROTO" = "none" ]; then - unset SPI_ESP_IN SPI_ESP_OUT KEY_ESP_IN KEY_ESP_OUT SPD_ESP_IN SPD_ESP_OUT -fi - -/sbin/setkey -c >/dev/null 2>&1 << EOF -${SPI_AH_OUT:+delete $SRC $DST ah $SPI_AH_OUT;} -${SPI_AH_IN:+delete $DST $SRC ah $SPI_AH_IN;} -${SPI_ESP_OUT:+delete $SRC $DST esp $SPI_ESP_OUT;} -${SPI_ESP_IN:+delete $DST $SRC esp $SPI_ESP_IN;} -spddelete $SPD_SRC $SPD_DST any -P out; -spddelete $SPD_DST $SPD_SRC any -P in; -${EXCLUDE_SRCNET:+spddelete $SPD_SRC $SPD_SRC any -P out;} -${EXCLUDE_SRCNET:+spddelete $SPD_SRC $SPD_SRC any -P in;} -EOF - -# ESP -if [ "$ESP_PROTO" != "none" ]; then - /sbin/setkey -c >/dev/null 2>&1 << EOF - ${KEY_ESP_IN:+add $DST $SRC esp $SPI_ESP_IN ${TUNNEL_MODE:+-m tunnel} \ - -E ${ESP_PROTO_IN:-$ESP_PROTO} $KEY_ESP_IN \ - ${KEY_AESP_IN:+-A ${AESP_PROTO_IN:-$AESP_PROTO} $KEY_AESP_IN} - ;} - ${KEY_ESP_OUT:+add $SRC $DST esp $SPI_ESP_OUT ${TUNNEL_MODE:+-m tunnel} \ - -E ${ESP_PROTO_OUT:-$ESP_PROTO} $KEY_ESP_OUT \ - ${KEY_AESP_OUT:+-A ${AESP_PROTO_OUT:-$AESP_PROTO} $KEY_AESP_OUT} - ;} -EOF -fi - -# AH -if [ "$AH_PROTO" != "none" ]; then - /sbin/setkey -c >/dev/null 2>&1 << EOF - ${KEY_AH_IN:+add $DST $SRC ah $SPI_AH_IN ${TUNNEL_MODE:+-m tunnel} -A ${AH_PROTO_IN:-$AH_PROTO} $KEY_AH_IN;} - ${KEY_AH_OUT:+add $SRC $DST ah $SPI_AH_OUT ${TUNNEL_MODE:+-m tunnel} -A ${AH_PROTO_OUT:-$AH_PROTO} $KEY_AH_OUT;} -EOF -fi - -/sbin/setkey -c >/dev/null 2>&1 << EOF -${EXCLUDE_SRCNET:+spdadd $SPD_SRC $SPD_SRC any -P out none;} -${EXCLUDE_SRCNET:+spdadd $SPD_SRC $SPD_SRC any -P in none;} -EOF - -# This looks weird but if you use both ESP and AH you need to configure them together, not seperately. -if [ "$ESP_PROTO" != "none" ] && [ "$AH_PROTO" != "none" ]; then -/sbin/setkey -c >/dev/null 2>&1 << EOF -spdadd $SPD_SRC $SPD_DST any -P out ipsec - ${SPD_ESP_OUT:+esp/$MODE/${TUNNEL_MODE:+$SRC-$DST}/require} - ${SPD_AH_OUT:+ah/$MODE/${TUNNEL_MODE:+$SRC-$DST}/require} - ; - -spdadd $SPD_DST $SPD_SRC any -P in ipsec - ${SPD_ESP_IN:+esp/$MODE/${TUNNEL_MODE:+$DST-$SRC}/require} - ${SPD_AH_IN:+ah/$MODE/${TUNNEL_MODE:+$DST-$SRC}/require} - ; -EOF -elif [ "$AH_PROTO" = "none" ]; then -/sbin/setkey -c >/dev/null 2>&1 << EOF -spdadd $SPD_SRC $SPD_DST any -P out ipsec - ${SPD_ESP_OUT:+esp/$MODE/${TUNNEL_MODE:+$SRC-$DST}/require} - ; - -spdadd $SPD_DST $SPD_SRC any -P in ipsec - ${SPD_ESP_IN:+esp/$MODE/${TUNNEL_MODE:+$DST-$SRC}/require} - ; -EOF -elif [ "$ESP_PROTO" = "none" ]; then -/sbin/setkey -c >/dev/null 2>&1 << EOF -spdadd $SPD_SRC $SPD_DST any -P out ipsec - ${SPD_AH_OUT:+ah/$MODE/${TUNNEL_MODE:+$SRC-$DST}/require} - ; - -spdadd $SPD_DST $SPD_SRC any -P in ipsec - ${SPD_AH_IN:+ah/$MODE/${TUNNEL_MODE:+$DST-$SRC}/require} - ; -EOF -fi - -if [ "$KEYING" = "automatic" -a -n "$IKE_METHOD" ]; then - if [ "$IKE_METHOD" = "PSK" ]; then - MYID=address - if [ -n "$MYID_TYPE" ]; then - case "$MYID_TYPE" in - *fqdn*) - MYID="$MYID_TYPE \"$MYID_VALUE\"" - ;; - esac - fi - tmpfile=$(mktemp /etc/racoon/psk.XXXXXX) - grep -v "^$DST " /etc/racoon/psk.txt > $tmpfile - echo "$DST $IKE_PSK" >> $tmpfile - mv -f $tmpfile /etc/racoon/psk.txt - fi - if [ ! -f /etc/racoon/$DST.conf ] || [ /etc/racoon/$DST.conf -ot $1 ] ; then - cat > /etc/racoon/$DST.conf << EOF -remote $DST -{ - exchange_mode aggressive, main; -EOF - case "$IKE_METHOD" in - PSK) - cat >> /etc/racoon/$DST.conf << EOF - my_identifier $MYID; - proposal { - encryption_algorithm $IKE_ENC; - hash_algorithm $IKE_AUTH; - authentication_method pre_shared_key; - dh_group $IKE_DHGROUP; - } -} -EOF - ;; - X509) - cat >> /etc/racoon/$DST.conf << EOF - my_identifier asn1dn; - peers_identifier asn1dn; - certificate_type x509 "$IKE_CERTFILE.public" "$IKE_CERTFILE.private"; -EOF - if [ -n "$IKE_DNSSEC" ]; then - echo " peers_certfile dnssec;" >> /etc/racoon/$DST.conf - fi - if [ -n "$IKE_PEER_CERTFILE" ]; then - echo " peers_certfile x509 \"$IKE_PEER_CERTFILE.public\";" >> /etc/racoon/$DST.conf - fi - cat >> /etc/racoon/$DST.conf << EOF - proposal { - encryption_algorithm $IKE_ENC; - hash_algorithm $IKE_AUTH; - authentication_method rsasig; - dh_group $IKE_DHGROUP; - } -} -EOF - ;; - GSSAPI) - cat >> /etc/racoon/$DST.conf << EOF - my_identifier address; - proposal { - encryption_algorithm $IKE_ENC; - hash_algorithm $IKE_AUTH; - authentication_method gssapi_krb; - dh_group $IKE_DHGROUP; - } -} -EOF - esac - fi - racoontmp=$(mktemp /etc/racoon/racoon.XXXXXX) - grep -v "^include \"/etc/racoon/$DST.conf\";" /etc/racoon/racoon.conf >> $racoontmp - echo "include \"/etc/racoon/$DST.conf\";" >> $racoontmp - mv -f $racoontmp /etc/racoon/racoon.conf -fi -if [ "$KEYING" = "automatic" ]; then - if ! pidof -x /usr/sbin/racoon > /dev/null 2>&1 ; then - /usr/sbin/racoon - elif [ -n "$IKE_METHOD" ]; then - killall -HUP racoon - fi -fi -- cgit v1.2.1 From b086b1eb36c0f1ea9c6a41479e64cdeed5720836 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 21 Jun 2011 15:20:21 -0400 Subject: Add back a message for udev start. (#714531, continued) --- rc.d/rc.sysinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index e0ce09c8..c572384a 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -137,7 +137,7 @@ fi nashpid=$(pidof nash 2>/dev/null) [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1 unset nashpid -/sbin/udevd --daemon +action $"Starting udev: " /sbin/udevd --daemon /sbin/udevadm trigger --type=subsystems --action=add /sbin/udevadm trigger --type=devices --action=add /sbin/udevadm settle -- cgit v1.2.1 From 4df6ec3e4bd3a949d6cb4303ea7b5c17ab2fd437 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 21 Jun 2011 15:41:29 -0400 Subject: 9.31-1 --- initscripts.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 9f1b5d28..e35161db 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.30 +Version: 9.31 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -314,6 +314,18 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Jun 21 2011 Bill Nottingham - 9.31-1 +- remove ifup/ifdown-ipsec; they're now in ipsec-tools +- rc.sysinit: start udev by hand, start_udev is no more (#714531) +- ifup-aliases: if IPv6 is configured on the alias, configure it. (#583409) +- ifup-eth: ensure DHCP_HOSTNAME is a short hostname, seed it from HOSTNAME if needed. (#697877) +- network-functions: override NETMASK from PREFIX where specified (#705367, ) +- exclude single symlink from main package (#705457) +- network: VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475) +- network: use LC_ALL=C when calling sed. (https://bugs.mageia.org/show_bug.cgi?id=1216, via ) +- functions: (umount_loop) fuser -k defaults to -9; set the initial pass to kill -15. (#703457) +- init.d/halt: don't match filesystem types in hostnames (#703203, ) + * Wed Apr 27 2011 Bill Nottingham - 9.30-1 - ifup-eth: handle IPADDRx correctly for static addresses (#697838) - systemd: fix storage setup service after cryptsetup.target (#699918) -- cgit v1.2.1 From 8a7e27e2bfc9dcaee4d7555e0f72de06c2cc4515 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 24 Jun 2011 10:07:44 -0400 Subject: Fix character cases for latest tcsh. --- debug.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug.csh b/debug.csh index bfd4735a..33b50acc 100644 --- a/debug.csh +++ b/debug.csh @@ -1,3 +1,3 @@ if ( -f /etc/sysconfig/debug ) then - eval `grep -Ev '(^[:blank:]*#|\$RANDOM)' /etc/sysconfig/debug | sed 's|^export ||g' | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'` + eval `grep -Ev '(^[[:blank:]]*#|\$RANDOM)' /etc/sysconfig/debug | sed 's|^export ||g' | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'` endif -- cgit v1.2.1 From 103b0cc1dd6f5c1ad903076f7c362fb0397edfc8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 24 Jun 2011 14:54:00 -0400 Subject: Fix some errors with TEMPORARY_STATE & systemd. (#704783) --- rwtab | 3 --- 1 file changed, 3 deletions(-) diff --git a/rwtab b/rwtab index cfcb8145..7dcb846a 100644 --- a/rwtab +++ b/rwtab @@ -1,9 +1,7 @@ dirs /var/cache/man dirs /var/gdm dirs /var/lib/xkb -dirs /var/lock dirs /var/log -dirs /var/run dirs /var/puppet dirs /var/lib/dbus dirs /var/lib/nfs @@ -25,7 +23,6 @@ empty /var/lib/pulse empty /var/lib/ups empty /var/tmp empty /var/tux -empty /media files /etc/adjtime files /etc/ntp.conf -- cgit v1.2.1 From 982b6ebfe2cdb1175bc8486135d33b897ad3d6ef Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 28 Jun 2011 14:40:13 -0400 Subject: Allow non-'-s' options in ETHTOOL_OPTS, and allow multiple option types. (#692410, #693583) --- sysconfig/network-scripts/ifup-eth | 20 +++++--------------- sysconfig/network-scripts/network-functions | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index f46a8843..e4c65aa0 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -99,9 +99,7 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then /sbin/ip link set dev ${DEVICE} down echo "+${DEVICE}" > /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null } - if [ -n "$ETHTOOL_OPTS" ] ; then - /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set exit 0 fi @@ -158,9 +156,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then fi /sbin/ip addr flush dev ${DEVICE} 2>/dev/null /sbin/ip link set dev ${DEVICE} up - if [ -n "$ETHTOOL_OPTS" ] ; then - /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} /usr/sbin/brctl addif ${BRIDGE} ${DEVICE} # Upon adding a device to a bridge, @@ -199,9 +195,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then exit 1 fi - if [ -n "$ETHTOOL_OPTS" ] ; then - /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set if /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then echo $" done." @@ -214,9 +208,7 @@ else if [ -z "${IPADDR}" -a -z "${IPADDR0}" -a -z "${IPADDR1}" -a -z "${IPADDR2}" ]; then # enable device without IP, useful for e.g. PPPoE ip link set dev ${REALDEVICE} up - if [ -n "$ETHTOOL_OPTS" ] ; then - /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} else @@ -230,9 +222,7 @@ else exit 1 fi - if [ -n "$ETHTOOL_OPTS" ] ; then - /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 2d3263a2..f6d2f05b 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -153,7 +153,21 @@ source_config () fi } - +ethtool_set() +{ + oldifs=$IFS; + IFS=';'; + for opts in $ETHTOOL_OPTS ; do + IFS=$oldifs; + if [[ "${opts}" =~ [[:space:]]*- ]]; then + /sbin/ethtool $opts + else + /sbin/ethtool -s ${REALDEVICE} $opts + fi + IFS=';'; + done + IFS=$oldifs; +} expand_config () { -- cgit v1.2.1 From b710648dee63466be01b34b21d929ada422f2845 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 25 Jul 2011 13:34:12 -0400 Subject: Remove fedora-sysinit-hack/fedora-sysinit-unhack; they're not needed with /var/lock on tmpfs. --- Makefile | 2 -- systemd/system/fedora-sysinit-hack.service | 10 ---------- systemd/system/fedora-sysinit-unhack.service | 11 ----------- 3 files changed, 23 deletions(-) delete mode 100644 systemd/system/fedora-sysinit-hack.service delete mode 100644 systemd/system/fedora-sysinit-unhack.service diff --git a/Makefile b/Makefile index 718b451e..1e8c09ee 100644 --- a/Makefile +++ b/Makefile @@ -127,11 +127,9 @@ install: ln -s ../fedora-autoswap.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants - ln -s ../fedora-sysinit-hack.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants - ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants mkdir -p $(ROOT)/etc/tmpfiles.d install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf diff --git a/systemd/system/fedora-sysinit-hack.service b/systemd/system/fedora-sysinit-hack.service deleted file mode 100644 index dd78da80..00000000 --- a/systemd/system/fedora-sysinit-hack.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Bootup hack -DefaultDependencies=no -Conflicts=shutdown.target -Before=basic.target shutdown.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/bin/touch /dev/.in_sysinit diff --git a/systemd/system/fedora-sysinit-unhack.service b/systemd/system/fedora-sysinit-unhack.service deleted file mode 100644 index 221d8bb1..00000000 --- a/systemd/system/fedora-sysinit-unhack.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Bootup unhack -DefaultDependencies=no -Conflicts=shutdown.target -Before=shutdown.target -After=fedora-sysinit-hack.service sysinit.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=-/bin/rm -f /dev/.in_sysinit -- cgit v1.2.1 From 74746399b84771b0990206c402cc8cc87ec35e2d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 25 Jul 2011 17:10:51 -0400 Subject: Add an empty CLIENTSTATE variable, to help with those that need to set it. (#725476) --- sysconfig/readonly-root | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysconfig/readonly-root b/sysconfig/readonly-root index dbf1829f..ac03e565 100644 --- a/sysconfig/readonly-root +++ b/sysconfig/readonly-root @@ -15,3 +15,5 @@ STATE_LABEL=stateless-state STATE_MOUNT=/var/lib/stateless/state # Options to use for peristent mount STATE_OPTIONS= +# NFS server to use for persistent data? +CLIENTSTATE= -- cgit v1.2.1 From 2d3dfa0c5c2d0e95943df8b5ec655787264012d7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 1 Aug 2011 16:12:07 -0400 Subject: Don't mount gfs2 in netfs (#689593) --- rc.d/init.d/netfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 6bb149f6..ae708eab 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -99,7 +99,7 @@ case "$1" in } touch /var/lock/subsys/netfs # The 'no' applies to all listed filesystem types. See mount(8). - action $"Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs + action $"Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs2 ;; stop) # Unmount loopback stuff first -- cgit v1.2.1 From 20915f8a7833168f5744b7580018315b17c48832 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 8 Aug 2011 11:58:19 -0400 Subject: Add freescale ttymx ports (#728730, ) --- src/console_check.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/console_check.c b/src/console_check.c index 8584f78e..688bff61 100644 --- a/src/console_check.c +++ b/src/console_check.c @@ -126,6 +126,8 @@ char *serial_tty_name(int type) { return "ttyCPM"; case PORT_MPC52xx: return "ttyPSC"; + case PORT_IMX: + return "ttymxc"; case PORT_OMAP: return "ttyO"; default: -- cgit v1.2.1 From eededf0b562fdee05572c810b485d3c53a8b2555 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 8 Aug 2011 12:03:24 -0400 Subject: Move console_init, console_check to legacy --- initscripts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index e35161db..e30d4719 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -266,8 +266,6 @@ rm -rf $RPM_BUILD_ROOT %exclude /lib/udev/rules.d/10-console.rules %exclude /lib/udev/rules.d/88-clock.rules /lib/udev/rename_device -/lib/udev/console_init -/lib/udev/console_check /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -307,6 +305,8 @@ rm -rf $RPM_BUILD_ROOT /etc/rc.d/rc /etc/rc.d/rc.sysinit /lib/udev/rules.d/* +/lib/udev/console_init +/lib/udev/console_check %files -n debugmode %defattr(-,root,root) -- cgit v1.2.1 From 53da81415a777306647251c68f64d073ec763531 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 9 Aug 2011 12:29:37 -0400 Subject: Fix pid file usage for IPv6. (#729292, ) --- sysconfig/network-scripts/ifdown-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 17386a71..d0936366 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -87,7 +87,7 @@ retcode=0 if [ -f "/var/run/dhclient$VER-${DEVICE}.pid" ]; then dhcpid=$(cat /var/run/dhclient$VER-${DEVICE}.pid) if [[ "$DHCPRELEASE" = [yY1]* ]]; then - /sbin/dhclient -r -lf /var/lib/dhclient/dhclient$VER-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1 + /sbin/dhclient -r -lf /var/lib/dhclient/dhclient$VER-${DEVICE}.leases -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1 retcode=$? else kill $dhcpid >/dev/null 2>&1 -- cgit v1.2.1 From 4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 9 Aug 2011 14:18:17 -0400 Subject: Drop fedora-autoswap; it's somewhat dangerous, and better done via a udev/systemd combination anyway. --- Makefile | 1 - systemd/fedora-autoswap | 18 ------------------ systemd/system/fedora-autoswap.service | 12 ------------ 3 files changed, 31 deletions(-) delete mode 100755 systemd/fedora-autoswap delete mode 100644 systemd/system/fedora-autoswap.service diff --git a/Makefile b/Makefile index 1e8c09ee..975317b9 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,6 @@ install: mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants ln -s ../fedora-configure.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants - ln -s ../fedora-autoswap.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants diff --git a/systemd/fedora-autoswap b/systemd/fedora-autoswap deleted file mode 100755 index ea392909..00000000 --- a/systemd/fedora-autoswap +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Support automatic swapon. -# - -. /etc/init.d/functions - -if [ "$AUTOSWAP" = "yes" ]; then - curswap=$(awk '/^\/dev/ { print $1 }' /proc/swaps | while read x; do get_numeric_dev dec $x ; echo -n " "; done) - swappartitions=$(blkid -t TYPE=swap -o device) - if [ x"$swappartitions" != x ]; then - for partition in $swappartitions ; do - [ ! -e $partition ] && continue - majmin=$(get_numeric_dev dec $partition) - echo $curswap | grep -qw "$majmin" || action $"Enabling local swap partitions: " swapon $partition - done - fi -fi diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service deleted file mode 100644 index 21754c9c..00000000 --- a/systemd/system/fedora-autoswap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Enable all detected swap partitions -DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target -Before=swap.target shutdown.target - -[Service] -ExecStart=/lib/systemd/fedora-autoswap -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes -- cgit v1.2.1 From 19ea300575c00132cf576ae0f8ef99f0c78f20d1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Aug 2011 16:23:38 -0400 Subject: plymouth lives in /bin. (#702814) --- init/quit-plymouth.conf | 2 +- rc.d/init.d/functions | 10 +++++----- rc.d/init.d/netfs | 4 ++-- rc.d/rc.sysinit | 10 +++++----- systemd/fedora-autorelabel | 2 +- systemd/fedora-configure | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/init/quit-plymouth.conf b/init/quit-plymouth.conf index 7f28391e..7a67b071 100644 --- a/init/quit-plymouth.conf +++ b/init/quit-plymouth.conf @@ -10,5 +10,5 @@ start on runlevel S or stopping rc RUNLEVEL=[234] task script - /usr/bin/plymouth quit || : + /bin/plymouth quit || : end script diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 1b0b4843..79545b51 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -546,8 +546,8 @@ echo_warning() { # Inform the graphical boot of our current state update_boot_stage() { - if [ -x /usr/bin/plymouth ]; then - /usr/bin/plymouth --update="$1" + if [ -x /bin/plymouth ]; then + /bin/plymouth --update="$1" fi return 0 } @@ -562,7 +562,7 @@ success() { failure() { local rc=$? [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_failure - [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --details + [ -x /bin/plymouth ] && /bin/plymouth --details return $rc } @@ -601,7 +601,7 @@ strstr() { # Confirm whether we really want to run this service confirm() { - [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash + [ -x /bin/plymouth ] && /bin/plymouth --hide-splash while : ; do echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] " read answer @@ -609,7 +609,7 @@ confirm() { return 0 elif strstr $"cC" "$answer" ; then rm -f /var/run/confirm - [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash + [ -x /bin/plymouth ] && /bin/plymouth --show-splash return 2 elif strstr $"nN" "$answer" ; then return 1 diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index ae708eab..4358572d 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -78,8 +78,8 @@ case "$1" in fi if [ "$rc" -gt 1 ]; then - if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping ; then - /usr/bin/plymouth --hide-splash + if [ -x /bin/plymouth ] && /bin/plymouth --ping ; then + /bin/plymouth --hide-splash fi failure "$STRING" tty >/dev/null 2>&1 || exit 1 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index c572384a..fd907f4a 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -32,7 +32,7 @@ fi . /etc/init.d/functions PLYMOUTH= -[ -x /usr/bin/plymouth ] && PLYMOUTH=yes +[ -x /bin/plymouth ] && PLYMOUTH=yes # Check SELinux status SELINUX_STATE= @@ -545,8 +545,8 @@ fi # Configure machine if necessary. if [ -f /.unconfigured ]; then - if [ -x /usr/bin/plymouth ]; then - /usr/bin/plymouth quit + if [ -x /bin/plymouth ]; then + /bin/plymouth quit fi if [ -x /usr/bin/system-config-keyboard ]; then @@ -660,7 +660,7 @@ if strstr "$cmdline" confirm ; then fi # Let rhgb know that we're leaving rc.sysinit -if [ -x /usr/bin/plymouth ]; then - /usr/bin/plymouth --sysinit +if [ -x /bin/plymouth ]; then + /bin/plymouth --sysinit fi diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index dad7a91f..70ece423 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -11,7 +11,7 @@ relabel_selinux() { AUTORELABEL= . /etc/selinux/config echo "0" > /selinux/enforce - [ -x /usr/bin/plymouth ] && plymouth --hide-splash + [ -x /bin/plymouth ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then echo diff --git a/systemd/fedora-configure b/systemd/fedora-configure index d1e4dbd3..43f17ca3 100755 --- a/systemd/fedora-configure +++ b/systemd/fedora-configure @@ -4,8 +4,8 @@ . /etc/init.d/functions -if [ -x /usr/bin/plymouth ]; then - /usr/bin/plymouth quit +if [ -x /bin/plymouth ]; then + /bin/plymouth quit fi if [ -x /usr/sbin/firstboot ]; then -- cgit v1.2.1 From 588b435f07ef70684d7979b0472b8a0aabe44d71 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 25 Aug 2011 14:33:48 -0400 Subject: Call multipath and kpartx with -u. (#733437) --- rc.d/init.d/netfs | 4 ++-- systemd/fedora-storage-init | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 4358572d..3633284b 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -48,9 +48,9 @@ case "$1" in fi if [ -f /etc/multipath.conf ] && [ -x /sbin/multipath ]; then modprobe dm-multipath >/dev/null 2>&1 - /sbin/multipath -v 0 + /sbin/multipath -u -v 0 if [ -x /sbin/kpartx ]; then - /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -u -a -p p" fi fi if [ -x /sbin/lvm ]; then diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init index 7f439bd9..66ba6a82 100755 --- a/systemd/fedora-storage-init +++ b/systemd/fedora-storage-init @@ -9,9 +9,9 @@ if ! strstr "$cmdline" nompath && [ -f /etc/multipath.conf ] && \ [ -x /sbin/multipath ]; then modprobe dm-multipath > /dev/null 2>&1 - /sbin/multipath -v 0 + /sbin/multipath -u -v 0 if [ -x /sbin/kpartx ]; then - /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -u -a -p p" >/dev/null fi fi @@ -25,7 +25,7 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then continue fi /sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1 - /sbin/kpartx -a -p p "/dev/mapper/$dmname" + /sbin/kpartx -u -a -p p "/dev/mapper/$dmname" done fi fi -- cgit v1.2.1 From 8e35de888bde8b123bf19c23cb4e8974cb75475e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 30 Aug 2011 15:17:14 -0400 Subject: selinuxfs moved, adjust code. (#733759) --- Makefile | 1 + rc.d/rc.sysinit | 14 +++++++------- systemd/fedora-autorelabel | 2 +- systemd/fedora-readonly | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 975317b9..3bbc48e1 100644 --- a/Makefile +++ b/Makefile @@ -163,6 +163,7 @@ clean: make clean -C src make clean -C po @rm -fv *~ changenew ChangeLog.old *gz + @find . -name "*~" -exec rm -f {} \; tag: @git tag -a -f -m "Tag as $(TAG)" $(TAG) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index fd907f4a..5248cfb1 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -36,9 +36,9 @@ PLYMOUTH= # Check SELinux status SELINUX_STATE= -if [ -e "/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then - if [ -r "/selinux/enforce" ] ; then - SELINUX_STATE=$(cat "/selinux/enforce") +if [ -e "/sys/fs/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then + if [ -r "/sys/fs/selinux/enforce" ] ; then + SELINUX_STATE=$(cat "/sys/fs/selinux/enforce") else # assume enforcing if you can't read it SELINUX_STATE=1 @@ -53,7 +53,7 @@ disable_selinux() { echo $"*** Warning -- SELinux is active" echo $"*** Disabling security enforcement for system recovery." echo $"*** Run 'setenforce 1' to reenable." - echo "0" > "/selinux/enforce" + echo "0" > "/sys/fs/selinux/enforce" } relabel_selinux() { @@ -61,7 +61,7 @@ relabel_selinux() { # wrong context, so a reboot will be required after relabel AUTORELABEL= . /etc/selinux/config - echo "0" > /selinux/enforce + echo "0" > /sys/fs/selinux/enforce [ -n "$PLYMOUTH" ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then @@ -231,9 +231,9 @@ elif [ -f /.autofsck ]; then echo $"*** Warning -- the system did not shut down cleanly. " echo $"*** Dropping you to a shell; the system will continue" echo $"*** when you leave the shell." - [ -n "$SELINUX_STATE" ] && echo "0" > /selinux/enforce + [ -n "$SELINUX_STATE" ] && echo "0" > /sys/fs/selinux/enforce sulogin - [ -n "$SELINUX_STATE" ] && echo "1" > /selinux/enforce + [ -n "$SELINUX_STATE" ] && echo "1" > /sys/fs/selinux/enforce [ -n "$PLYMOUTH" ] && plymouth --show-splash fi fsckoptions="$AUTOFSCK_OPT $fsckoptions" diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 70ece423..61dc5517 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -10,7 +10,7 @@ relabel_selinux() { # wrong context, so a reboot will be required after relabel AUTORELABEL= . /etc/selinux/config - echo "0" > /selinux/enforce + echo "0" > /sys/fs/selinux/enforce [ -x /bin/plymouth ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then diff --git a/systemd/fedora-readonly b/systemd/fedora-readonly index 70e57a62..4e8003a2 100755 --- a/systemd/fedora-readonly +++ b/systemd/fedora-readonly @@ -7,9 +7,9 @@ # Check SELinux status SELINUX_STATE= -if [ -e "/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then - if [ -r "/selinux/enforce" ] ; then - SELINUX_STATE=$(cat "/selinux/enforce") +if [ -e "/sys/fs/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then + if [ -r "/sys/fs/selinux/enforce" ] ; then + SELINUX_STATE=$(cat "/sys/fs/selinux/enforce") else # assume enforcing if you can't read it SELINUX_STATE=1 -- cgit v1.2.1 From 156b8f1569c4c19030d80b34a5cb61dc38a1c6ed Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 30 Aug 2011 15:18:00 -0400 Subject: Be more verbose on make clean. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3bbc48e1..00e81b0c 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ clean: make clean -C src make clean -C po @rm -fv *~ changenew ChangeLog.old *gz - @find . -name "*~" -exec rm -f {} \; + @find . -name "*~" -exec rm -v -f {} \; tag: @git tag -a -f -m "Tag as $(TAG)" $(TAG) -- cgit v1.2.1 From 96f8614c974e11eb05706f2cbecbe4ba41420691 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 30 Aug 2011 15:21:08 -0400 Subject: Add a conflict for libselinux that uses the old mount point. --- initscripts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/initscripts.spec b/initscripts.spec index e30d4719..4a4b3a24 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -54,6 +54,7 @@ Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Conflicts: NetworkManager < 1:0.8.0-12.git20100504 +Conflicts: libselinux < 2.1.0 Conflicts: ipsec-tools < 0.8.0-2 Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd -- cgit v1.2.1 From 84d0dadb52b1dfb4ecb01d1416c59da6a8af166c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 31 Aug 2011 14:51:38 -0400 Subject: Add support for setting random bridge options via BRIDGING_OPTS. (#734045, #665378) --- sysconfig.txt | 8 ++++++++ sysconfig/network-scripts/ifup-eth | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/sysconfig.txt b/sysconfig.txt index 6a3c3b57..002c3be8 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -958,6 +958,14 @@ Files in /etc/sysconfig/network-scripts/ TYPE=Bridge STP=off|on (see 'brctl stp') DELAY=forward delay time in seconds (see 'brctl setfd') + BRIDGING_OPTS= + A space-separated list of bridging options for either the bridge + device, or the port device, such as: + + BRIDGING_OPTS="hello_time=200 priority=65535" + for bridge devices, or + BRIDGING_OPTS="hairpin_mode=1" + for port devices. TUN/TAP-specific items: OWNER= diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index e4c65aa0..de6add11 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -56,6 +56,12 @@ if [ "${TYPE}" = "Bridge" ]; then fi [ -n "${DELAY}" ] && /usr/sbin/brctl setfd ${DEVICE} ${DELAY} [ -n "${STP}" ] && /usr/sbin/brctl stp ${DEVICE} ${STP} + # add the bits to setup driver parameters here + for arg in $BRIDGING_OPTS ; do + key=${arg%%=*}; + value=${arg##*=}; + echo $value > /sys/class/net/${DEVICE}/bridge/$key + done fi # If the device is a tap device, create it with tunctl, if available. @@ -159,6 +165,12 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then ethtool_set [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} /usr/sbin/brctl addif ${BRIDGE} ${DEVICE} + # add the bits to setup driver parameters here + for arg in $BRIDGING_OPTS ; do + key=${arg%%=*}; + value=${arg##*=}; + echo $value > /sys/class/net/${DEVICE}/brport/$key + done # Upon adding a device to a bridge, # it's necessary to make radvd reload its config [ -r /var/run/radvd/radvd.pid ] && kill -HUP $(cat /var/run/radvd/radvd.pid) -- cgit v1.2.1 From c2c581ca7de1fb90ec43a3edfa53a1dfce2705c4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 31 Aug 2011 18:00:12 -0400 Subject: %ghost rc.local (but leave it around on upgrade) (#734268) It will still be run if it's created, of course. --- initscripts.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 4a4b3a24..43f85c74 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -129,6 +129,10 @@ rm -f \ touch $RPM_BUILD_ROOT/etc/crypttab chmod 600 $RPM_BUILD_ROOT/etc/crypttab +rm -f $RPM_BUILD_ROOT/etc/rc.d/rc.local $RPM_BUILD_ROOT/etc/rc.local +touch $RPM_BUILD_ROOT/etc/rc.d/rc.local +chmod 755 $RPM_BUILD_ROOT/etc/rc.d/rc.local + %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -237,17 +241,17 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rc.d %dir /etc/rc.d/rc[0-9].d %config(missingok) /etc/rc.d/rc[0-9].d/* +%exclude /etc/rc.d/rc[0-9].d/*local %exclude /etc/rc.d/rc[0-9].d/*reboot %exclude /etc/rc.d/rc[0-9].d/*halt /etc/rc[0-9].d %dir /etc/rc.d/init.d -/etc/rc.local /etc/rc.d/init.d/* %exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/reboot %exclude /etc/rc.d/rc[0-9].d/*single %exclude /etc/rc.d/init.d/single -%config(noreplace) /etc/rc.d/rc.local +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf %exclude /etc/profile.d/debug* /etc/profile.d/* -- cgit v1.2.1 From dd1f8bf0d98214d139fcf9ac23a4dddf50e92fbf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 31 Aug 2011 18:05:35 -0400 Subject: Clean up the old sysv excludes, including for killall script. --- initscripts.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 43f85c74..27285c11 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -241,15 +241,13 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rc.d %dir /etc/rc.d/rc[0-9].d %config(missingok) /etc/rc.d/rc[0-9].d/* -%exclude /etc/rc.d/rc[0-9].d/*local -%exclude /etc/rc.d/rc[0-9].d/*reboot -%exclude /etc/rc.d/rc[0-9].d/*halt +%exclude /etc/rc.d/rc[0-9].d/* /etc/rc[0-9].d %dir /etc/rc.d/init.d /etc/rc.d/init.d/* %exclude /etc/rc.d/init.d/halt +%exclude /etc/rc.d/init.d/killall %exclude /etc/rc.d/init.d/reboot -%exclude /etc/rc.d/rc[0-9].d/*single %exclude /etc/rc.d/init.d/single %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf -- cgit v1.2.1 From 4bf4bb047cd0e15852108bcc26d249531936f5b6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 1 Sep 2011 16:42:54 -0400 Subject: If exec() of all DMs fails, call 'plymouth quit'. (#735215) --- prefdm | 1 + 1 file changed, 1 insertion(+) diff --git a/prefdm b/prefdm index bab1b065..425d0ffe 100755 --- a/prefdm +++ b/prefdm @@ -47,4 +47,5 @@ for pkg in $(rpm -q --qf "%{NAME}\n" --whatprovides "service(graphical-login)"| done # catch all exit error +plymouth quit exit 1 -- cgit v1.2.1 From ad92013f536bc6bdc9dc0fd5d11353308276f109 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 1 Sep 2011 16:45:15 -0400 Subject: Updates from TX. --- po/eu_ES.po | 4 +++- po/hy.po | 4 +++- po/ku.po | 4 +++- po/lo.po | 4 +++- po/my.po | 4 +++- po/wa.po | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/po/eu_ES.po b/po/eu_ES.po index a1e98f69..2a186128 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-04-06 19:57+0000\n" +"PO-Revision-Date: 2011-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -4900,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + diff --git a/po/hy.po b/po/hy.po index d6729967..8a0bf98a 100644 --- a/po/hy.po +++ b/po/hy.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-04-06 19:56+0000\n" +"PO-Revision-Date: 2011-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -4900,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + diff --git a/po/ku.po b/po/ku.po index 62175ea7..12aa0974 100644 --- a/po/ku.po +++ b/po/ku.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-04-06 19:56+0000\n" +"PO-Revision-Date: 2011-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -4900,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + diff --git a/po/lo.po b/po/lo.po index b9ca0fe5..e0ba9452 100644 --- a/po/lo.po +++ b/po/lo.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-04-06 19:56+0000\n" +"PO-Revision-Date: 2011-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -4900,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + diff --git a/po/my.po b/po/my.po index 6dacb5e1..0bb6f9cc 100644 --- a/po/my.po +++ b/po/my.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-04-06 19:57+0000\n" +"PO-Revision-Date: 2011-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -4900,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + diff --git a/po/wa.po b/po/wa.po index 379a01fd..73724b34 100644 --- a/po/wa.po +++ b/po/wa.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fedora-initscripts\n" -"PO-Revision-Date: 2011-04-06 19:56+0000\n" +"PO-Revision-Date: 2011-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -4900,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + -- cgit v1.2.1 From e270fc3c0954c5145960c6ce7baffba0ed0448a9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 Sep 2011 15:41:12 -0400 Subject: 9.32-1 --- initscripts.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 27285c11..97a7666c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.31 +Version: 9.32 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -317,6 +317,24 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Sep 2 2011 Bill Nottingham - 9.32-1 +- prefdm: if exec() of all DMs fails, call 'plymouth quit' (#735215) +- %%ghost rc.local (but leave it around on upgrade) (#734268) +- ifup: support random bridging options via BRIDGING_OPTS (#734045, #665378) +- selinuxfs moved to /sys/fs, handle it (#733759) +- netfs/fedora-storage-init: call multipath and kpartx with -u (#733437) +- plymouth lives in /bin (#702814) +- drop fedora-autoswap +- ifdown-eth: fix dhclient pid file for IPv6 (#729292, ) +- move some more things to the legacy subpackage +- netfs: don't mount gfs2 here (#689593) +- readonly-root: add an empty CLIENTSTATE defintion (#725476) +- drop sysinit hack/unhack +- ifup-eth: allow more options in ETHTOOL_OPTS (#692410, #693583) +- rwtab: update for systemd (#704783) +- debug.csh: fix for latest csh +- update translations: eu_ES, hy, ku, lo, my, wa + * Tue Jun 21 2011 Bill Nottingham - 9.31-1 - remove ifup/ifdown-ipsec; they're now in ipsec-tools - rc.sysinit: start udev by hand, start_udev is no more (#714531) -- cgit v1.2.1 From 09bfb5033230e6846414bc6002aa12ce09c23687 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 19 Sep 2011 17:45:17 -0400 Subject: Only bother with consoletype if we're actually connected to something that's console-ish. (#657869) If we're connected to a socket, or a pipe, or a file, or anything else - assume dumb mode. --- rc.d/init.d/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 79545b51..e313e35b 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -54,10 +54,10 @@ systemctl_redirect () { [ -z "${COLUMNS:-}" ] && COLUMNS=80 if [ -z "${CONSOLETYPE:-}" ]; then - if [ -r "/dev/stderr" ]; then + if [ -c "/dev/stderr" ]; then CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" else - CONSOLETYPE="$(/sbin/consoletype 2>/dev/null)" + CONSOLETYPE="serial" fi fi -- cgit v1.2.1 From e1afcc44754dab8adc7dd1099fbea61b941e52d9 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Sat, 24 Sep 2011 13:04:09 +0200 Subject: do not check for the existence of a systemd unit before redirecting It is wrong to look only in /lib/systemd/system. systemd can handle units in several other directories as well. The check is needless. Simply redirect everything that's not a SysV service and let systemctl report an error if it's invalid. --- service | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/service b/service index 1a426356..6f179347 100755 --- a/service +++ b/service @@ -7,7 +7,6 @@ USAGE="Usage: $(basename $0) < option > | --status-all | \ [ service_name [ command | --full-restart ] ]" SERVICE= SERVICEDIR="/etc/init.d" -SYSTEMDSERVICEDIR="/lib/systemd/system" OPTIONS= if [ $# -eq 0 ]; then @@ -69,10 +68,7 @@ done if [ -f "${SERVICEDIR}/${SERVICE}" ]; then env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${OPTIONS} -elif [ -f "${SYSTEMDSERVICEDIR}/${SERVICE}.service" ]; then +else echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr exec /bin/systemctl ${OPTIONS} ${SERVICE}.service -else - echo $"${SERVICE}: unrecognized service" >&2 - exit 1 fi -- cgit v1.2.1 From a28a3f03b42377f50ab46fd669bc93b287c20b11 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 30 Sep 2011 10:52:05 -0400 Subject: Be less picky about ifcfg file names. (#742276) --- rc.d/init.d/network | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/network b/rc.d/init.d/network index b3dbe7a6..c6b86c37 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -43,10 +43,10 @@ cd /etc/sysconfig/network-scripts # find all the interfaces besides loopback. # ignore aliases, alternative configurations, and editor backup files -interfaces=$(ls ifcfg* | \ +interfaces=$(ls ifcfg-* | \ LC_ALL=C sed -e "$__sed_discard_ignored_files" \ -e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \ - -e '/ifcfg-[A-Za-z0-9#\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ + -e '{ s/^ifcfg-//g;s/[0-9]/ &/}' | \ LC_ALL=C sort -k 1,1 -k 2n | \ LC_ALL=C sed 's/ //') rc=0 -- cgit v1.2.1 From 73d7cf7234f4c903e13de28d71a839afff9b93ca Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 6 Oct 2011 14:22:18 -0400 Subject: Drop this entirely, as it causes issues in conjunction with systemd. Non-systemd init daemons will need to recreate this functionality. --- udev/rules.d/88-clock.rules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 udev/rules.d/88-clock.rules diff --git a/udev/rules.d/88-clock.rules b/udev/rules.d/88-clock.rules deleted file mode 100644 index d7162982..00000000 --- a/udev/rules.d/88-clock.rules +++ /dev/null @@ -1,3 +0,0 @@ -ACTION=="add", SUBSYSTEM=="rtc", ATTR{hctosys}=="1", RUN+="/sbin/hwclock --systz --rtc=/dev/%k" -ACTION=="add", SUBSYSTEM=="rtc", ATTR{hctosys}=="0", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" -ACTION=="add", ENV{MAJOR}=="10", ENV{MINOR}=="135", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" -- cgit v1.2.1 From 07b90103fcee7e6ec096f941fd4688923b8cf768 Mon Sep 17 00:00:00 2001 From: Doug Knight Date: Fri, 7 Oct 2011 11:59:17 -0800 Subject: Only use the first ARP response in netconsole (#744309) --- rc.d/init.d/netconsole | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/init.d/netconsole b/rc.d/init.d/netconsole index 7f91a6c6..42733de0 100644 --- a/rc.d/init.d/netconsole +++ b/rc.d/init.d/netconsole @@ -54,7 +54,7 @@ print_address_info () target=$host fi if [ -z "$SYSLOGMACADDR" ]; then - arp=$(LANG=C /sbin/arping -c 1 -I $DEV $target 2>/dev/null | awk '/ reply from .*[.*]/ { print gensub(".* reply from .* \\[(.*)\\].*","\\1","G") }') + arp=$(LANG=C /sbin/arping -c 1 -I $DEV $target 2>/dev/null | awk '/ reply from .*[.*]/ { print gensub(".* reply from .* \\[(.*)\\].*","\\1","G"); exit }') [ -n "$arp" ] && echo "SYSLOGMACADDR=$arp" fi } -- cgit v1.2.1 From cbc9da68cc15b95482521db9895a2e54ca82fb6a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 16:48:50 -0400 Subject: Bump release --- initscripts.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 97a7666c..51c5f706 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.32 +Version: 9.33 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -317,6 +317,13 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Oct 12 2011 Bill Nottingham - 9.33-1 +- netconsole: only use the first ARP response (#744309, ) +- udev/rules.d/88-clock.rules: drop this entirely, as it causes issues in conjunction with systemd +- init.d/network: be less picky about ifcfg file names. (#742276) +- /sbin/service: do not check for the existence of a systemd unit before redirecting () +- init.d/functions: only run consoletype if connected to something that's console-ish. (#657869) + * Fri Sep 2 2011 Bill Nottingham - 9.32-1 - prefdm: if exec() of all DMs fails, call 'plymouth quit' (#735215) - %%ghost rc.local (but leave it around on upgrade) (#734268) -- cgit v1.2.1 From 3494ff02745842e08895bfcebdc0d880986403bb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 17:03:48 -0400 Subject: Drop 88-clock.rules exclude --- initscripts.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 51c5f706..47290ebc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -267,7 +267,6 @@ rm -rf $RPM_BUILD_ROOT %attr(2755,root,root) /sbin/netreport /lib/udev/rules.d/* %exclude /lib/udev/rules.d/10-console.rules -%exclude /lib/udev/rules.d/88-clock.rules /lib/udev/rename_device /sbin/service /sbin/ppp-watch -- cgit v1.2.1 From 05d7d8b6ee43103a589c8a999d5d96bdcd06f519 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 13 Oct 2011 14:14:47 -0400 Subject: Fix logic error with removing arp_ip_target (#745681) --- sysconfig/network-scripts/ifdown-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index d0936366..fcbae80e 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -59,7 +59,7 @@ if is_bonding_device ${DEVICE} ; then done for arg in $BONDING_OPTS ; do key=${arg%%=*}; - [[ "${key}" != "arp_ip_target" ]] || continue + [[ "${key}" != "arp_ip_target" ]] && continue value=${arg##*=}; if [ "${value:0:1}" != "" ]; then OLDIFS=$IFS; -- cgit v1.2.1 From d088bd27ef9fac2695c9769b4fbb230e32d93b31 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 25 Oct 2011 12:47:26 -0400 Subject: If locale.conf exists, use it. (#706756, in part) systemd's algorithm on startup is: - if /etc/locale.conf is parseable, use that - otherwise, use /etc/sysconfig/i18n Given that we have a heirarchy of system -> user settings here, simply go: ~/.i18n > /etc/locale.conf > /etc/sysconfig/i18n Add some documentation as well. --- lang.csh | 2 +- lang.sh | 2 +- prefdm | 1 + rc.d/init.d/functions | 2 +- rc.d/rc | 2 +- sysconfig.txt | 20 +++++++++++++++----- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lang.csh b/lang.csh index e8560b24..3a65c64b 100755 --- a/lang.csh +++ b/lang.csh @@ -11,7 +11,7 @@ if ($?LANG) then setenv LANG $saved_lang unset saved_lang else - foreach file (/etc/sysconfig/i18n "$HOME/.i18n") + foreach file (/etc/sysconfig/i18n /etc/locale.conf "$HOME/.i18n") if ( -f $file ) then eval `sed -ne 's|^[[:blank:]]*\([^#=]\{1,\}\)=\([^=]*\)|setenv \1 \2;|p' $file` set sourced=1 diff --git a/lang.sh b/lang.sh index 5be62ad8..9ad5e847 100755 --- a/lang.sh +++ b/lang.sh @@ -8,7 +8,7 @@ if [ -n "$LANG" ]; then LANG="$saved_lang" unset saved_lang else - for langfile in /etc/sysconfig/i18n "$HOME/.i18n" ; do + for langfile in /etc/sysconfig/i18n /etc/locale.conf "$HOME/.i18n" ; do [ -f $langfile ] && . $langfile && sourced=1 done fi diff --git a/prefdm b/prefdm index 425d0ffe..4ee44fc5 100755 --- a/prefdm +++ b/prefdm @@ -4,6 +4,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin # We need to source this so that the login screens get translated [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n +[ -f /etc/locale.conf ] && . /etc/locale.conf # Run preferred X display manager preferred= diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index e313e35b..1437b252 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -61,7 +61,7 @@ if [ -z "${CONSOLETYPE:-}" ]; then fi fi -if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n ] ; then +if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then . /etc/profile.d/lang.sh 2>/dev/null # avoid propagating LANGSH_SOURCED any further unset LANGSH_SOURCED diff --git a/rc.d/rc b/rc.d/rc index 678bb5e5..d7b68b69 100755 --- a/rc.d/rc +++ b/rc.d/rc @@ -51,7 +51,7 @@ fi # Set language, vc settings once to avoid doing it for every init script # through functions -if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n ] ; then +if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then . /etc/profile.d/lang.sh 2>/dev/null export LANGSH_SOURCED=1 fi diff --git a/sysconfig.txt b/sysconfig.txt index 002c3be8..60cc84f4 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -431,9 +431,10 @@ Generic options: -q option is not given to sendmail if /etc/sysconfig/sendmail exists and QUEUE is empty or undefined. -/etc/sysconfig/i18n - If ~/.i18n exists, it is used in addition to /etc/sysconfig/i18n and allows - per-user customization of the locales. +/etc/locale.conf + + A configutration file for locale settings. See locale.conf(5) for + more details. LANG= set locale for all categories, can be any two letter ISO language code @@ -451,6 +452,14 @@ Generic options: The above variables are used in /etc/profile.d/lang.sh. + This data will be also be read from the legacy /etc/sysconfig/i18n + location, but /etc/locale.conf takes precedence. + + If ~/.i18n exists, it is used in addition to /etc/locale.conf and + /etc/sysconfig/i18n for per-user customization of the locales. + +/etc/vconsole.conf: + SYSFONT= Console font. Fonts are found in /lib/kbd/consolefonts. UNIMAP= Unicode font map. Most fonts have these built-in. Font maps @@ -460,8 +469,9 @@ Generic options: SYSFONTACM= Console map. These are applied via setfont's -m option, and are found in /lib/kbd/consoletrans. - The above are used by the /sbin/setsysfont command (which is run - by rc.sysinit at boot time.) For more information, see setfont(8). + The above are used to set up the keyboard at boot time. For more + information, see vconsole.conf(5). If this file does not exist, + values will be read from /etc/sysconfig/i18n. Files in /etc/sysconfig/network-scripts/ ======================================== -- cgit v1.2.1 From 6ce3e4700baa4e37e6b16e4160c00b2ebea58d81 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 25 Oct 2011 15:23:32 -0400 Subject: 9.34-1 --- initscripts.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 47290ebc..30731caa 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.33 +Version: 9.34 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -316,6 +316,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Oct 25 2011 Bill Nottingham - 9.34-1 +- read locale.conf if it exists (#706756) +- ifdown: fix logic error with removing arp_ip_target (#745681) + * Wed Oct 12 2011 Bill Nottingham - 9.33-1 - netconsole: only use the first ARP response (#744309, ) - udev/rules.d/88-clock.rules: drop this entirely, as it causes issues in conjunction with systemd -- cgit v1.2.1