diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-11-03 22:26:54 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-11-03 22:26:54 +0000 |
| commit | 1e6179bf54cbc84b4ad33480e7f2f713418bb28a (patch) | |
| tree | 794b2654be506d551421bcc47d3ad97822e2861c | |
| parent | 87589b49d1543595188dcb26aa5a09d33e5e0a4e (diff) | |
| parent | 6ce3e4700baa4e37e6b16e4160c00b2ebea58d81 (diff) | |
| download | initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.gz initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.bz2 initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.xz initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.zip | |
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
68 files changed, 1699 insertions, 1896 deletions
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/<lang>.po +source_file = po/initscripts.pot +source_lang = en + @@ -133,12 +133,11 @@ 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-sysinit-hack.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 ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants - ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants + ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants ln -s ../mandriva-clean-var-run-lock.service $(ROOT)/lib/systemd/system/sysinit.target.wants ln -s ../mandriva-boot-links.service $(ROOT)/lib/systemd/system/basic.target.wants @@ -178,6 +177,7 @@ clean: make clean -C src make clean -C po @rm -fv *~ changenew ChangeLog.old *gz + @find . -name "*~" -exec rm -v -f {} \; tag: @make -C mandriva cvstag 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 || { @@ -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=<device 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 @@ -86,6 +89,10 @@ 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, and will be formatted as a swap partition @@ -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 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/initscripts.spec b/initscripts.spec index 3d91ac3f..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.25 +Version: 9.34 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -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 @@ -54,6 +54,8 @@ 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 Requires(post): /sbin/chkconfig, coreutils @@ -125,6 +127,11 @@ rm -f \ %endif 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 @@ -203,8 +210,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 @@ -236,15 +241,15 @@ 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/*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.local /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 -%config(noreplace) /etc/rc.d/rc.local +%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 %exclude /etc/profile.d/debug* /etc/profile.d/* @@ -262,10 +267,7 @@ 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 -/lib/udev/console_init -/lib/udev/console_check /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -305,6 +307,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) @@ -312,6 +316,86 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Oct 25 2011 Bill Nottingham <notting@redhat.com> - 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 <notting@redhat.com> - 9.33-1 +- netconsole: only use the first ARP response (#744309, <doug.knight@karmix.org>) +- 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 (<mschmidt@redhat.com>) +- init.d/functions: only run consoletype if connected to something that's console-ish. (#657869) + +* Fri Sep 2 2011 Bill Nottingham <notting@redhat.com> - 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, <daveg@dgit.ndo.co.uk>) +- 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 <notting@redhat.com> - 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, <mpoole@redhat.com>) +- 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 <sander.lepik@eesti.ee>) +- 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, <jmueller@data-tronics.com>) + +* Wed Apr 27 2011 Bill Nottingham <notting@redhat.com> - 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 (<rstrode@redhat.com>) +- 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 (<jklimes@redhat.com>) +- ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, <harald@redhat.com>) +- ifup-eth: ensure bond exists before bringing up slaves (#694501) + +* Wed Apr 06 2011 Bill Nottingham <notting@redhat.com> - 9.29-1 +- systemd: add a storage setup service after cryptsetup.target (#692198) +- fix /.autorelabel handling (<mschimdt@redhat.com>) +- 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 (<harald@redhat.com>) + +* Fri Mar 25 2011 Bill Nottingham <notting@redhat.com> - 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 <notting@redhat.com> - 9.27-1 +- init.d/functions: fix mishandled argument to fstab-decode. (#685137) +- support ipv6 routing rules, merge route/rule code (#680872, <tobiasoed@hotmail.com>) +- autorelabel.service, loadmodules.service: fix conditions so that they operate as OR, not AND. (#684125) + +* Thu Mar 10 2011 Bill Nottingham <notting@redhat.com> - 9.26-1 +- network-functions: fix check for unmanaged devices (#670154) +- ifup-eth: also check /dev/.run/initramfs (<harald@redhat.com>) +- systemd: execute fedora-sysinit-unhack after sysinit.target (<arvidjaar@gmail.com>) +- init.d/functions: don't do force/lazy umount for the first nfs umount. (#676851, <jlayton@redhat.com>) +- further sysctl.d fixes (#593211) +- init.d/functions: make killproc more granular when delay is passed. (#428029, <xjakub@fi.muni.cz>) +- ifup: add GVRP support (#597598, <tomek@jot23.org>) +- init.d/functions: add support for noauto crypt devices, to mirror systemd +- documentation updates +- bash cleanups (<ville.skytta@iki.fi>) +- ifup: remove network device naming requirement from VLAN devices (#462095, <Matt_Domsch@dell.com>) + * Fri Feb 25 2011 Bill Nottingham <notting@redhat.com> - 9.25-1 - remove 'Red Hat Linux' references from sysctl.conf* (<ville.skytta@iki.fi>) - rc.sysinit: add support for sysctl.d (#593211, <martin@laptop.org>) diff --git a/inittab.systemd b/inittab.systemd index 59f09e94..c9694e65 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 <X>, run: +# systemd uses 'targets' instead of runlevels. By default, there are two main targets: +# +# multi-user.target: analogous to runlevel 3 +# graphical.target: analogous to runlevel 5 +# +# To set a default target, run: +# +# ln -s /lib/systemd/system/<target name>.target /etc/systemd/system/default.target # -# ln -s /lib/systemd/system/runlevel<X>.target /etc/systemd/system/default.target @@ -8,7 +8,7 @@ if ($?GDM_LANG) then set LC_SOURCED=1 setenv LANG $GDM_LANG else - foreach file ("$HOME/.i18n" /etc/sysconfig/i18n) + foreach file ("$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n) if ($LC_SOURCED != 1 && -f $file ) then eval `sed 's|=C$|=en_US|g' $file | sed 's|^#.*||' | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' ` setenv LC_SOURCED 1 @@ -21,7 +21,7 @@ fi # only source one of the possible files, and in that order; # if system wide and user config are mixed and different, umpredictable # things will happen... -for langfile in "$HOME/.i18n" /etc/sysconfig/i18n ; do +for langfile in "$HOME/.i18n" /etc/locale.conf /etc/sysconfig/i18n ; do [ -f $langfile -a "$LC_SOURCED" != 1 ] && . $langfile && LC_SOURCED=1 && export LC_SOURCED done diff --git a/po/eu_ES.po b/po/eu_ES.po index 8a6826ce..2a186128 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-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: <XX@li.org>\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 @@ -4890,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + @@ -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 <he-users@lists.fedoraproject.org>\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 @@ -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-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: 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 @@ -4890,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + @@ -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 "" + + @@ -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-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: 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 @@ -4895,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + @@ -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-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: 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 @@ -4890,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + @@ -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-04-06 19:57+0000\n" +"Last-Translator: \n" +"Language-Team: Sinhala <None>\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 @@ -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-04-06 19:56+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: 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 @@ -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 <fedoratrans@gmail.com>, 2007, 2009. -# Christian Rose <menthos@menthos.com>, 2006. -# Göran Uddeborg <goeran@uddeborg.se>, 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 <goeran@uddeborg.se>\n" -"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"Project-Id-Version: fedora-initscripts\n" +"PO-Revision-Date: 2011-03-01 19:51+0000\n" +"Last-Translator: goeran <goeran@uddeborg.se>\n" +"Language-Team: Swedish <None>\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} [<configfile.{yml|conf}>]" msgstr "" -"Användning: $prog {start|stop|status|reload|restart|condrestart|force-reload|" -"try-restart} [<configfile.{yml|conf}>]" +"Användning: $prog {start|stop|status|reload|restart|condrestart|force-reload" +"|try-restart} [<configfile.{yml|conf}>]" #: /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}" @@ -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 <trans-urdu@lists.fedoraproject.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: 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 @@ -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-09-01 20:46+0000\n" "Last-Translator: \n" "Language-Team: <XX@li.org>\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 @@ -4890,3 +4900,5 @@ msgstr "" #: /etc/rc.d/init.d/audio-entropyd:34 msgid "Shutting down Audio Entropy daemon: " msgstr "" + + diff --git a/ppp/ip-down.ipv6to4 b/ppp/ip-down.ipv6to4 index d6e50b54..29f1c646 100755 --- 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..c41ad828 100755 --- 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 @@ -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 @@ -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 '/\<mtu\>/ { print $5 }')" if [ -n "$ipv4mtu" ]; then # IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header tunnelmtu=$[ $ipv4mtu - 20 ] @@ -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 @@ -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,15 +178,15 @@ 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 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/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 @@ -41,27 +41,25 @@ if [ -f /etc/sysconfig/desktop ]; then [ -z "$DISPLAYMANAGER" ] && DISPLAYMANAGER=$DESKTOP if [ "$DISPLAYMANAGER" = "GDM" -o "$DISPLAYMANAGER" = "gdm" -o "$DISPLAYMANAGER" = "GNOME" -o "$DISPLAYMANAGER" = "gnome" -o "$DISPLAYMANAGER" = "Gnome" ]; then dm=GNOME - # only new gdm will shutdown plymouth itself - [ ! -d "/var/run/gdm" ] || no_plymouth_quit="yes" - elif [ "$DISPLAYMANAGER" = "KDE" -o "$DISPLAYMANAGER" = "kde" ]; then - dm=KDE -# no_plymouth_quit="yes" - elif [ "$DISPLAYMANAGER" = "KDM" -o "$DISPLAYMANAGER" = "kdm" ]; then + elif [ "$DISPLAYMANAGER" = "KDM" -o "$DISPLAYMANAGER" = "kdm" -o "$DISPLAYMANAGER" = "KDE" -o "$DISPLAYMANAGER" = "kde" ]; then dm=KDM -# no_plymouth_quit="yes" elif [ "$DISPLAYMANAGER" = "WDM" -o "$DISPLAYMANAGER" = "wdm" ] ; then dm=WDM + plymouth_quit=yes elif [ "$DISPLAYMANAGER" = "XDM" -o "$DISPLAYMANAGER" = "xdm" ] ; then dm=XDM + plymouth_quit=yes elif [ "$DISPLAYMANAGER" = "SLiM" -o "$DISPLAYMANAGER" = "slim" ] ; then dm=SLiM - elif [ -n "$DISPLAYMANAGER" ]; then + plymouth_quit=yes + elif [ -n "$DISPLAYMANAGER" ]; then dm=$DISPLAYMANAGER + plymouth_quit=yes fi fi -# shut down boot splash -[ -x /bin/plymouth ] && [ "x$no_plymouth_quit" != "xyes" ] && /bin/plymouth quit +# shut down boot splash if needed (gdm/kdm do it his internally) +[ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit # xdm-like program are launched from the console, however, the locale-setting # can be done in a way that console is not localize, while X11 is. @@ -79,4 +77,6 @@ if [ -n "$preferred" ]; then echo -n $! > /var/run/dm.pid fi -exit 0 +# catch all exit error +plymouth quit +exit 1 diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 6f989ba4..43b3abe4 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -64,17 +64,23 @@ systemctl_redirect () { [ -z "${COLUMNS:-}" ] && COLUMNS=80 function load_i18_settings() { - if [ -f /etc/sysconfig/i18n -a -z "$NOLOCALE" ]; then - . /etc/sysconfig/i18n - if [ "$CONSOLETYPE" != "pty" ]; then - [ "$CONSOLE_NOT_LOCALIZED" = "yes" ] && GP_LANG=C - [ "$CONSOLE_NOT_LOCALIZED" = "yes" ] && GP_LANGUAGE=C - fi - if [ -z "$GP_LANG" ]; then - [ -n "$LC_CTYPE" ] && GP_LANG=$LC_CTYPE || GP_LANG=$LC_MESSAGES - fi - if [ -z "$GP_LANGUAGE" ]; then - [ -n "$LANGUAGE" ] && GP_LANGUAGE=$LANGUAGE || GP_LANGUAGE=$GP_LANG + if [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ]; then + if [ -z "$NOLOCALE" ]; then + if [ -f /etc/locale.conf ]; then + . /etc/locale.conf + else + . /etc/sysconfig/i18n + fi + if [ "$CONSOLETYPE" != "pty" ]; then + [ "$CONSOLE_NOT_LOCALIZED" = "yes" ] && GP_LANG=C + [ "$CONSOLE_NOT_LOCALIZED" = "yes" ] && GP_LANGUAGE=C + fi + if [ -z "$GP_LANG" ]; then + [ -n "$LC_CTYPE" ] && GP_LANG=$LC_CTYPE || GP_LANG=$LC_MESSAGES + fi + if [ -z "$GP_LANGUAGE" ]; then + [ -n "$LANGUAGE" ] && GP_LANGUAGE=$LANGUAGE || GP_LANGUAGE=$GP_LANG + fi fi fi } @@ -198,17 +204,17 @@ __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() { - local remaining sig= + local remaining sig=-15 local retry=3 count 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 @@ -230,7 +236,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 != "/" && $2 !~ /^\/live\// {print $2}' /proc/mounts) @@ -387,7 +393,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. @@ -432,12 +438,18 @@ killproc() { if checkpid $pid 2>&1; then # 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 + usleep 50000 + 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 50000 + fi fi fi checkpid $pid @@ -827,6 +839,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" ] @@ -846,7 +867,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 @@ -861,8 +882,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 gprintf "INSECURE MODE FOR %s\n" $key fi fi @@ -926,6 +947,9 @@ init_crypto() { skip="yes" fi ;; + noauto) + skip="yes" + ;; verify) params="$params -y" ;; @@ -968,10 +992,16 @@ init_crypto() { fi 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 diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index c137d87d..80deb629 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -182,7 +182,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} $2 ~ /^\/live\//{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): " \ diff --git a/rc.d/init.d/netconsole b/rc.d/init.d/netconsole index 520a846b..14f96d76 100644 --- a/rc.d/init.d/netconsole +++ b/rc.d/init.d/netconsole @@ -63,7 +63,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 } diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index d3f22714..2a37ce76 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -49,14 +49,14 @@ 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 - /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 @@ -84,8 +84,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 @@ -104,7 +104,8 @@ case "$1" in fi } touch /var/lock/subsys/netfs - action "Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs -O noencrypted + # The 'no' applies to all listed filesystem types. See mount(8). + action $"Mounting other filesystems: " mount -a -t nonfs,nfs4,cifs,ncpfs,gfs2 -O noencrypted ;; stop) # Unmount loopback stuff first diff --git a/rc.d/init.d/network b/rc.d/init.d/network index dd4fcb8e..9b86aa70 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -69,7 +69,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 if [ -r /etc/ethers -a -x /sbin/arp ]; then action "Storing ARP mapping" /sbin/arp -f /etc/ethers @@ -123,6 +123,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 @@ -146,10 +150,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 @@ -200,8 +200,8 @@ 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 ;; stop) @@ -73,7 +73,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/10lang.sh 2>/dev/null export LANGSH_SOURCED=1 fi diff --git a/rc.d/rc.local b/rc.d/rc.local index 6d125d8b..cf1cf8dc 100755 --- a/rc.d/rc.local +++ b/rc.d/rc.local @@ -5,7 +5,7 @@ # X-Mandriva-Compat-Mode # Default-Start: 2 3 4 5 # Short-Description: Local initialization script -# Description: This script will be executed *after* all the other init scripts. +# Description: 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. ### END INIT INFO diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 18368b08..6b1baf0f 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -20,6 +20,10 @@ if [ -f /etc/sysconfig/system ]; then . /etc/sysconfig/system fi +if [ -r /etc/hostname ]; then + HOSTNAME=$(cat /etc/hostname) +fi + if [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; then HOSTNAME=localhost fi @@ -161,11 +165,14 @@ if [ "x$SPEEDBOOT" = "xyes" ]; then UDEV_PID=$! fi +PLYMOUTH= +[ -x /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") +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 @@ -180,7 +187,7 @@ disable_selinux() { gprintf "*** Warning -- SELinux is active\n" gprintf "*** Disabling security enforcement for system recovery.\n" gprintf "*** Run 'setenforce 1' to reenable.\n" - echo "0" > "/selinux/enforce" + echo "0" > "/sys/fs/selinux/enforce" } relabel_selinux() { @@ -188,7 +195,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 @@ -271,9 +278,11 @@ fi nashpid=$(pidof nash 2>/dev/null) [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1 unset nashpid -if [ "x$SPEEDBOOT" != "xyes" ]; then - /sbin/start_udev -fi #SPEEDBOOT + +action $"Starting 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 @@ -297,11 +306,7 @@ mount -n -t tmpfs none /dev/shm >/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 if [ "x$SPEEDBOOT" != "xyes" ]; then @@ -381,8 +386,12 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then done fi fi +fi fi #SPEEDBOOT +# Start any MD RAID arrays that haven't been started yet +[ -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 --ignorelockingfailure fi @@ -393,7 +402,7 @@ if [ -f /etc/crypttab ]; then fi fi #SPEEDBOOT -if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then +if strstr "$cmdline" fastboot || [ -f /fastboot ]; then fastboot=yes fi @@ -404,7 +413,7 @@ fi # (blino) always source autofsck settings, for AUTOFSCK_CRYPTO_TIMEOUT (#16029) [ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck -if [ -f /forcefsck ] || strstr "$cmdline" forcefsck ; then +if strstr "$cmdline" forcefsck || [ -f /forcefsck ]; then fsckoptions="-f $fsckoptions" elif [ -f /.autofsck ]; then if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then @@ -417,9 +426,9 @@ elif [ -f /.autofsck ]; then gprintf "*** Warning -- the system did not shut down cleanly. \n" gprintf "*** Dropping you to a shell; the system will continue\n" gprintf "*** when you leave the shell.\n" - [ -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" @@ -519,7 +528,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 @@ -747,6 +756,7 @@ fi # export locales (needed by mount.ntfs-3g) export LC_ALL export LANG +# The 'no' applies to all listed filesystem types. See mount(8). if [ "$READONLY" != "yes" ] ; then action "Mounting local filesystems: " mount -a -t nodevpts,nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev,noloop,noencrypted else @@ -845,8 +855,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 @@ -951,14 +961,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 ( @@ -1172,8 +1180,8 @@ for i in XF86Config XF86Config-4; do done # 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 # remove this file at the very end, for speedboot @@ -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 diff --git a/src/console_check.c b/src/console_check.c index 5ae8a13a..9b66cfcb 100644 --- a/src/console_check.c +++ b/src/console_check.c @@ -127,6 +127,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: diff --git a/sysconfig.txt b/sysconfig.txt index 92982258..78f7eebc 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -202,6 +202,7 @@ Generic options: NETWORKING=yes|no HOSTNAME=<fqdn by default, but whatever hostname you want> + Note that this can be overriden by /etc/hostname. GATEWAY=<gateway IP> GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0) NISDOMAIN=<nis domain name> @@ -318,9 +319,12 @@ Generic options: is no longer valid for 2.4 kernels. NETWORKING_IPV6=yes|no Enable or disable global IPv6 initialization - - To do this properly, add a rule in /etc/modprobe.conf that - disables ipv6 functionality. Example: + + 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: @@ -457,9 +461,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 @@ -477,6 +482,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 /usr/lib/kbd/consolefonts. UNIMAP= Unicode font map. Most fonts have these built-in. Font maps @@ -486,8 +499,9 @@ Generic options: SYSFONTACM= Console map. These are applied via setfont's -m option, and are found in /usr/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/ ======================================== @@ -613,6 +627,11 @@ Files in /etc/sysconfig/network-scripts/ on the same subnet as $GATEWAY will set the default route to be via $GATEWAY, and no other dhclient session will set 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 @@ -813,6 +832,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 @@ -1017,6 +1039,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=<owner of the device> diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 711d3284..684cef73 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -42,13 +42,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 @@ -60,8 +60,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/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/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6 index 9f04531a..7bfcfb34 100644 --- 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=$(echo ${DEVICE} | sed 's/:.*//g') -[ "$DEVICE" != "$REALDEVICE" ] && exit 0 +REALDEVICE=${DEVICE%%:*} +DEVICE=$REALDEVICE [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 . /etc/sysconfig/network-scripts/network-functions-ipv6 @@ -120,7 +119,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-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/ifdown-sit b/sysconfig/network-scripts/ifdown-sit index 041dc3cd..39e9c50f 100644 --- 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 @@ -37,7 +37,7 @@ REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') # 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 a96aff4b..e04effe7 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 fb203f5a..914309c0 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -76,9 +76,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}?' @@ -86,21 +86,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 @@ -117,10 +117,14 @@ 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}" + 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..fc21c7b6 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 @@ -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; @@ -337,11 +339,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 b1039176..93b6241e 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -52,7 +52,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." mdv-network-event connection_failure ${DEVICE} exit 1 fi @@ -61,7 +61,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" mdv-network-event connection_failure ${DEVICE} exit 1 fi @@ -70,12 +70,18 @@ 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. if [ "${TYPE}" = "Tap" ]; then if [ ! -x /usr/sbin/tunctl -a ! -x /usr/bin/tunctl ]; then - echo $"Tap support not available: tunctl not found" + net_log $"Tap support not available: tunctl not found" mdv-network-event connection_failure ${DEVICE} exit 1 fi @@ -95,9 +101,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 mdv-network-event connection_failure ${DEVICE} exit 1 @@ -173,13 +179,12 @@ fi # 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 } - if [ -n "$ETHTOOL_OPTS" ] ; then - ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set exit 0 fi @@ -198,10 +203,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 @@ -230,11 +241,15 @@ 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} + # 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) @@ -351,7 +366,7 @@ fi if [ -n "${DYNCONFIG}" ]; then # 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/.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 @@ -366,9 +381,7 @@ if [ -n "${DYNCONFIG}" ]; then exit 1 fi - if [ -n "$ETHTOOL_OPTS" ] ; then - ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set mdv-network-event dhcp_request ${DEVICE} if $DHCP_CLIENT $DHCP_ARGS ; then @@ -395,12 +408,10 @@ if [ -n "${DYNCONFIG}" ]; 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 - ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} else @@ -410,14 +421,12 @@ 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}." mdv-network-event connection_failure ${DEVICE} exit 1 fi - if [ -n "$ETHTOOL_OPTS" ] ; then - ethtool -s ${REALDEVICE} $ETHTOOL_OPTS - fi + ethtool_set [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} @@ -468,10 +477,12 @@ else fi 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 @@ -484,10 +495,8 @@ fi # IPv6 initialisation? /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} -if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then - /sbin/dhcp6c ${DHCPV6C_OPTIONS} ${DEVICE} - dhcp6_pid=($(/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DHCPV6C_OPTIONS} ${DEVICE}" | egrep -v grep)) - [ -n "$dhcp6_pid" ] && echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid +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 -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE} fi if [ "${IPX}" = yes ]; then 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 diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index 4facc403..509e49f3 100644 --- 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=$(echo ${DEVICE} | sed 's/:.*//g') -[ "$DEVICE" != "$REALDEVICE" ] && exit 0 +REALDEVICE=${DEVICE%%:*} +DEVICE=$REALDEVICE # Test whether IPv6 configuration is enabled for this interface, else stop [ "$IPV6INIT" = "yes" ] || exit 0 @@ -98,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 @@ -115,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 @@ -145,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 @@ -161,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 - cat "/etc/sysconfig/network-scripts/route6-$DEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do - /sbin/ip -6 route add $line - done -fi - # Setup of 6to4, if configured if [ "$IPV6TO4INIT" = "yes" ]; then valid6to4config="yes" @@ -176,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" mdv-network-event connection_failure ${DEVICE} exit 1 fi @@ -204,7 +196,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 @@ -217,14 +209,14 @@ 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 # 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 '/\<mtu\>/ { print $5 }')" if [ -n "$ipv4mtu" ]; then # IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header tunnelmtu=$(($ipv4mtu-20)) @@ -232,7 +224,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 @@ -246,7 +238,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 @@ -266,7 +258,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" @@ -282,7 +274,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 @@ -290,22 +282,22 @@ 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 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" mdv-network-event connection_failure ${DEVICE} exit 1 fi 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-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 diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit index b41dbf81..9e55146b 100644 --- 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 @@ -55,13 +55,13 @@ 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" mdv-network-event connection_failure ${DEVICE} 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" mdv-network-event connection_failure ${DEVICE} exit 1 fi @@ -70,7 +70,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" mdv-network-event connection_failure ${DEVICE} exit 1 fi @@ -109,7 +109,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/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel index fe43cdd9..b235bfe0 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." mdv-network-event connection_failure ${DEVICE} exit 1 fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 37e088a0..5ca3abe6 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -53,7 +53,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 }' } need_config () @@ -150,7 +150,21 @@ source_config () is_true $NM_CONTROLLED && USE_NM=true } - +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 () { @@ -166,6 +180,8 @@ expand_config () eval $(/bin/ipcalc --broadcast ${IPADDR} ${NETMASK}) fi + [ -n "$DHCP_HOSTNAME" ] && DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*} + if [ -z "${NETWORK}" ]; then eval $(/bin/ipcalc --network ${IPADDR} ${NETMASK}) fi @@ -188,9 +204,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 @@ -214,7 +229,7 @@ is_nm_active () is_nm_device_unmanaged () { - LANG=C LC_ALL=C nmcli -t --fields device,state dev status 2>/dev/null | grep -q "^${1}:unmanaged$" + LANG=C LC_ALL=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 @@ -438,3 +453,41 @@ clear_resolv_conf () rm -f /etc/resolv.conf.save fi } + +# Logging function +# +# Usage: net_log <message> <err|warning|info> <optional file/function name> +# +# Default level is 'err'. + +net_log() { + local message="$1" + local level="$2" + local name="$3" + + [ -z "$message" ] && return 1 + [ -z "$level" ] && level=err + [ -z "$name" ] && name=$0 + + 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" + fi + return 0 +} diff --git a/sysconfig/network-scripts/network-functions-ipv6 b/sysconfig/network-scripts/network-functions-ipv6 index 24100cba..394367bb 100644 --- a/sysconfig/network-scripts/network-functions-ipv6 +++ b/sysconfig/network-scripts/network-functions-ipv6 @@ -11,158 +11,6 @@ # - - - - -##### Logging function -# $1: <message> : 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: <function name> : 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,20 +156,20 @@ 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 # 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 @@ -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,14 +229,14 @@ 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 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 '/\<inet6\>/ && $2 ~ /^2002:/ { print $2 }' | while read addr; do /sbin/ip -6 addr del ${addr} dev ${dev} done @@ -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,10 +340,10 @@ 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="$(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 }')" @@ -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 @@ -654,7 +501,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 @@ -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 @@ -831,7 +678,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: '/\<ipv6\/ip\>/ { print $1 }' | while read device; do ipv6_del_tunnel_device $device done @@ -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 @@ -987,17 +834,17 @@ 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 - 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 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= diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 326837b2..61dc5517 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -5,27 +5,13 @@ . /etc/init.d/functions -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 AUTORELABEL= . /etc/selinux/config - echo "0" > /selinux/enforce - [ -n "$PLYMOUTH" ] && plymouth --hide-splash + echo "0" > /sys/fs/selinux/enforce + [ -x /bin/plymouth ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then echo @@ -47,16 +33,8 @@ 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 -else - if [ "$READONLY" != "yes" ] && [ -d /etc/selinux ]; then - [ -f /.autorelabel ] || touch /.autorelabel - fi +if [ "$READONLY" != "yes" ]; then + restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1 + relabel_selinux fi 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/fedora-configure b/systemd/fedora-configure index e6779fed..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 @@ -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} 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 diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init index b01a4657..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,13 +25,13 @@ 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 # 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 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 diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service index 10b37f69..c98a40ff 100644 --- a/systemd/system/fedora-autorelabel.service +++ b/systemd/system/fedora-autorelabel.service @@ -5,8 +5,9 @@ Requires=local-fs.target Conflicts=shutdown.target After=local-fs.target Before=sysinit.target shutdown.target -ConditionKernelCommandLine=autorelabel -ConditionPathExists=/.autorelabel +ConditionSecurity=selinux +ConditionKernelCommandLine=|autorelabel +ConditionPathExists=|/.autorelabel [Service] ExecStart=/lib/systemd/fedora-autorelabel 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 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 diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service new file mode 100644 index 00000000..bfd4b73b --- /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 fedora-storage-init.service +Before=local-fs.target shutdown.target +Wants=fedora-wait-storage.service + +[Service] +ExecStart=/lib/systemd/fedora-storage-init +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes 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 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" |