Merge commit 'initscripts-9.34-1' into mga-34

This brings our fully patched initscripts branch up to version 9.34.

Some code was not easily merged and thus not all functionality relating
to multiple IP addresses per interface were merged in.

Conflicts:
	Makefile
	lang.csh
	lang.sh
	prefdm
	rc.d/init.d/functions
	rc.d/init.d/netfs
	rc.d/init.d/network
	rc.d/rc
	rc.d/rc.local
	rc.d/rc.sysinit
	service
	sysconfig.txt
	sysconfig/network-scripts/ifdown-eth
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ipv6
	sysconfig/network-scripts/ifup-sit
	sysconfig/network-scripts/ifup-tunnel
	sysconfig/network-scripts/network-functions
	systemd/system/fedora-sysinit-unhack.service

1 files changed, 89 insertions, 82 deletions

diff --git a/po/ku.po b/po/ku.po
index d77b5023..12aa0974 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-09-01 20:46+0000\n"
+"Last-Translator: \n"
+"Language-Team: <XX@li.org>\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
@@ -4895,3 +4900,5 @@ msgstr ""
 #: /etc/rc.d/init.d/audio-entropyd:34
 msgid "Shutting down Audio Entropy daemon: "
 msgstr ""
+
+