From 62a009968fdc66de146938f0d79255b8628b3e4b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 12 Jul 2014 18:11:34 -0400 Subject: [PATCH 01/10] fix license handling --- initscripts.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index a2ef80a..65218a6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.54 License: GPLv2 Group: System Environment/Base -Release: 4%{?dist} +Release: 5%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -193,7 +193,9 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport -%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING +%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 +%{!?_licensedir:%global license %%doc} +%license COPYING /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp @@ -210,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Sat Jul 12 2014 Tom Callaway - 9.54-5 +- fix license handling + * Sat Jun 07 2014 Fedora Release Engineering - 9.54-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f354b7fb8619252e399b43c52ff92c759af0bcd6 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 22 Jul 2014 14:01:56 +0200 Subject: [PATCH 02/10] 9.55-1 --- .gitignore | 1 + initscripts.spec | 23 ++++++++++------------- sources | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 1cb58c5..d42145f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /initscripts-9.52.tar.bz2 /initscripts-9.53.tar.bz2 /initscripts-9.54.tar.bz2 +/initscripts-9.55.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 65218a6..983a55b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.54 +Version: 9.55 License: GPLv2 Group: System Environment/Base -Release: 5%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,8 +34,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch0: 0001-remove-ppp-from-translation.patch - %description The initscripts package contains the basic system scripts used to boot your Red Hat or Fedora system, change runlevels, and shut the system down @@ -55,8 +53,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%autopatch -p1 - %build make @@ -212,14 +208,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Sat Jul 12 2014 Tom Callaway - 9.54-5 +* Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 - fix license handling - -* Sat Jun 07 2014 Fedora Release Engineering - 9.54-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Lukáš Nykrýn - 9.54-3 -- don't require sysctl, it is in procps anyway +- ipcalc: -c allow netmask +- ipcalc: parse prefix more safely +- inittab: fix path and mention set-default +- don't require /sbin/sysctl +- init.d/functions: check parent dir of pid file for accessibility +- ifup-eth: some options for bridge can be applied after the bridge is up +- remove ppp from translation * Tue Apr 15 2014 Lukáš Nykrýn - 9.54-1 - move ppp support to ppp package diff --git a/sources b/sources index fa129ca..566d078 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf63862785d224394053f081865eb853 initscripts-9.54.tar.bz2 +0672f648a9ee8607a2df65835c54f5e5 initscripts-9.55.tar.bz2 From d0aa269f72b3acc147487f8dcdc7d4044ab3aba6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 21:35:28 +0000 Subject: [PATCH 03/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 983a55b..38812a7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.55 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 9.55-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 - fix license handling - ipcalc: -c allow netmask From aa2fefe005bc7dce9a1c4afc55a83d8120616553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 6 Oct 2014 11:54:07 -0400 Subject: [PATCH 04/10] 9.56.1-1 --- .gitignore | 1 + 0001-remove-ppp-from-translation.patch | 500 ------------------------- initscripts.spec | 65 ++-- sources | 2 +- 4 files changed, 38 insertions(+), 530 deletions(-) delete mode 100644 0001-remove-ppp-from-translation.patch diff --git a/.gitignore b/.gitignore index d42145f..0edb983 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /initscripts-9.53.tar.bz2 /initscripts-9.54.tar.bz2 /initscripts-9.55.tar.bz2 +/initscripts-9.56.1.tar.bz2 diff --git a/0001-remove-ppp-from-translation.patch b/0001-remove-ppp-from-translation.patch deleted file mode 100644 index b54c213..0000000 --- a/0001-remove-ppp-from-translation.patch +++ /dev/null @@ -1,500 +0,0 @@ -From e1f4ca4ebaab97166a315e0e54231ea8dbf7588c Mon Sep 17 00:00:00 2001 -From: Lukas Nykryn -Date: Thu, 24 Apr 2014 13:59:06 +0200 -Subject: [PATCH] remove ppp from translation - ---- - po/Makefile | 2 +- - po/initscripts.pot | 166 ++++++++++++++++++++--------------------------------- - 2 files changed, 62 insertions(+), 106 deletions(-) - -diff --git a/po/Makefile b/po/Makefile -index fb81b9a..a5658ec 100644 ---- a/po/Makefile -+++ b/po/Makefile -@@ -10,7 +10,7 @@ NLSPACKAGE = initscripts - CATALOGS = $(shell ls *.po) - FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS)) - --POTFILES = ../ppp/ip* $(shell ls ../sysconfig/network-scripts/* | grep -v ifcfg-) \ -+POTFILES = $(shell ls ../sysconfig/network-scripts/* | grep -v ifcfg-) \ - ../service ../sys-unconfig ../systemd/fedora-* ../rc.d/init.d/* - - all: $(NLSPACKAGE).pot $(FMTCATALOGS) -diff --git a/po/initscripts.pot b/po/initscripts.pot -index cd791f1..99d9cf8 100644 ---- a/po/initscripts.pot -+++ b/po/initscripts.pot -@@ -8,7 +8,7 @@ msgstr "" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8-bit\n" - --#: ../sysconfig/network-scripts/ifup-eth:231 -+#: ../sysconfig/network-scripts/ifup-eth:245 - msgid "Error, some other host already uses address ${ipaddr[$idx]}." - msgstr "" - -@@ -24,10 +24,6 @@ msgstr "" - msgid "Missing remote IPv4 address of tunnel, configuration is not valid" - msgstr "" - --#: ../service:78 --msgid "Redirecting to /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE}.service" --msgstr "" -- - #: ../rc.d/init.d/functions:410 - msgid "${base} status unknown due to insufficient privileges." - msgstr "" -@@ -40,7 +36,7 @@ msgstr "" - msgid "Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:123 ../sysconfig/network-scripts/ifup-ipv6:226 -+#: ../sysconfig/network-scripts/ifup-ipv6:226 - msgid "Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" - msgstr "" - -@@ -48,7 +44,7 @@ msgstr "" - msgid "Unsupported reason '$reason' for sending trigger to radvd" - msgstr "" - --#: ../sysconfig/network-scripts/ifup:103 ../sysconfig/network-scripts/ifup-eth:78 -+#: ../sysconfig/network-scripts/ifup:104 ../sysconfig/network-scripts/ifup-eth:85 - msgid "$alias device ${DEVICE} does not seem to be present, delaying initialization." - msgstr "" - -@@ -64,12 +60,8 @@ msgstr "" - msgid "*** when you leave the shell." - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:75 --msgid "ifup-ppp for ${DEVNAME} exiting" --msgstr "" -- --#: ../sysconfig/network-scripts/ifup-ppp:142 --msgid "pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}" -+#: ../sysconfig/network-scripts/ifup-eth:179 -+msgid "Determining IP information for ${DEVICE}..." - msgstr "" - - #: ../rc.d/init.d/functions:463 -@@ -88,12 +80,8 @@ msgstr "" - msgid "$base startup" - msgstr "" - --#: ../ppp/ip-down.ipv6to4:35 ../ppp/ip-up.ipv6to4:41 --msgid "Argument 1 is empty but should contain interface name - skip IPv6to4 initialization" --msgstr "" -- --#: ../ppp/ip-up.ipv6to4:189 ../sysconfig/network-scripts/ifup-ipv6:292 --msgid "radvd control enabled, but config is not complete" -+#: ../sysconfig/network-scripts/ifup-eth:43 -+msgid "Device ${DEVICE} has different MAC address than expected, ignoring." - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:383 -@@ -104,11 +92,11 @@ msgstr "" - msgid "Server address not specified in /etc/sysconfig/netconsole" - msgstr "" - --#: ../sysconfig/network-scripts/network-functions-ipv6:798 --msgid "Missing parameter 'IPv6 MTU' (arg 2)" -+#: ../rc.d/init.d/functions:419 -+msgid "${base} dead but subsys locked" - msgstr "" - --#: ../rc.d/init.d/network:67 -+#: ../rc.d/init.d/network:65 - msgid "Bringing up loopback interface: " - msgstr "" - -@@ -124,27 +112,35 @@ msgstr "" - msgid "Missing parameter 'selection' (arg 2)" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:91 ../sysconfig/network-scripts/ifup-ipv6:211 -+#: ../sysconfig/network-scripts/ifup-ipv6:211 - msgid "IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" - msgstr "" - -+#: ../sysconfig/network-scripts/ifup-aliases:165 -+msgid "error in $FILE: invalid alias number" -+msgstr "" -+ - #: ../sysconfig/network-scripts/ifup-aliases:190 - msgid "error iN $FILE: didn't specify netmask or prefix" - msgstr "" - -+#: ../sysconfig/network-scripts/ifup-aliases:264 -+msgid "Error, some other host already uses address ${IPADDR}." -+msgstr "" -+ - #: ../sysconfig/network-scripts/ifdown-tunnel:36 ../sysconfig/network-scripts/ifup-tunnel:63 - msgid "Device '$DEVICE' isn't supported as a valid GRE device name." - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:43 --msgid "Device ${DEVICE} has different MAC address than expected, ignoring." -+#: ../sysconfig/network-scripts/ifup-ipv6:292 -+msgid "radvd control enabled, but config is not complete" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-aliases:264 --msgid "Error, some other host already uses address ${IPADDR}." -+#: ../sysconfig/network-scripts/ifup-eth:279 -+msgid "Error adding default gateway for ${REALDEVICE}." - msgstr "" - --#: ../rc.d/init.d/network:271 -+#: ../rc.d/init.d/network:244 - msgid "Usage: $0 {start|stop|status|restart|reload|force-reload}" - msgstr "" - -@@ -156,7 +152,7 @@ msgstr "" - msgid "Initializing netconsole" - msgstr "" - --#: ../sysconfig/network-scripts/ifdown-eth:42 ../sysconfig/network-scripts/ifdown-eth:48 -+#: ../sysconfig/network-scripts/ifdown-eth:46 ../sysconfig/network-scripts/ifdown-eth:52 - msgid "Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." - msgstr "" - -@@ -164,7 +160,7 @@ msgstr "" - msgid "FAILED" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:286 -+#: ../sysconfig/network-scripts/ifup-eth:301 - msgid "Determining IPv6 information for ${DEVICE}..." - msgstr "" - -@@ -176,8 +172,8 @@ msgstr "" - msgid "$0: Usage: daemon [+/-nicelevel] {program}" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-aliases:165 --msgid "error in $FILE: invalid alias number" -+#: ../sysconfig/network-scripts/network-functions-ipv6:798 -+msgid "Missing parameter 'IPv6 MTU' (arg 2)" - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:159 -@@ -188,7 +184,7 @@ msgstr "" - msgid "Usage: ifup " - msgstr "" - --#: ../sysconfig/network-scripts/ifup:126 ../sysconfig/network-scripts/ifup:127 -+#: ../sysconfig/network-scripts/ifup:127 ../sysconfig/network-scripts/ifup:128 - msgid "ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" - msgstr "" - -@@ -196,11 +192,11 @@ msgstr "" - msgid "ERROR: ${DEVICE} did not come up!" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:138 ../sysconfig/network-scripts/ifup-ipv6:240 -+#: ../sysconfig/network-scripts/ifup-ipv6:240 - msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" - msgstr "" - --#: ../rc.d/init.d/network:133 ../rc.d/init.d/network:140 -+#: ../rc.d/init.d/network:121 ../rc.d/init.d/network:128 - msgid "Bringing up interface $i: " - msgstr "" - -@@ -208,7 +204,7 @@ msgstr "" - msgid "Usage: $0 {start|stop|reload|restart|showsysctl}" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:80 -+#: ../sysconfig/network-scripts/ifup-eth:87 - msgid "Device ${DEVICE} does not seem to be present, delaying initialization." - msgstr "" - -@@ -220,7 +216,7 @@ msgstr "" - msgid "Missing parameter 'device' (arg 1)" - msgstr "" - --#: ../rc.d/init.d/network:82 -+#: ../rc.d/init.d/network:70 - msgid "No 802.1Q VLAN support available in kernel." - msgstr "" - -@@ -256,7 +252,7 @@ msgstr "" - msgid "error in $FILE: IPADDR_START greater than IPADDR_END" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:260 -+#: ../sysconfig/network-scripts/ifup-eth:275 - msgid "Error adding default gateway ${GATEWAY} for ${DEVICE}." - msgstr "" - -@@ -264,7 +260,7 @@ msgstr "" - msgid " OK " - msgstr "" - --#: ../sysconfig/network-scripts/network-functions:540 -+#: ../sysconfig/network-scripts/network-functions:545 - msgid "INFO " - msgstr "" - -@@ -276,7 +272,7 @@ msgstr "" - msgid "Users cannot control this device." - msgstr "" - --#: ../sysconfig/network-scripts/ifup:89 -+#: ../sysconfig/network-scripts/ifup:90 - msgid "PHYSDEV should be set for device ${DEVICE}" - msgstr "" - -@@ -284,7 +280,7 @@ msgstr "" - msgid "radvd not (properly) installed, triggering failed" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:177 ../sysconfig/network-scripts/ifup-eth:290 -+#: ../sysconfig/network-scripts/ifup-eth:191 ../sysconfig/network-scripts/ifup-eth:305 - msgid " failed." - msgstr "" - -@@ -296,7 +292,7 @@ msgstr "" - msgid "*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. " - msgstr "" - --#: ../rc.d/init.d/network:258 -+#: ../rc.d/init.d/network:231 - msgid "Configured devices:" - msgstr "" - -@@ -332,23 +328,15 @@ msgstr "" - msgid "Invalid tunnel type $TYPE" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:48 --msgid "pppd does not exist or is not executable for ${DEVICE}" --msgstr "" -- - #: ../sysconfig/network-scripts/ifup:37 - msgid "$0: configuration for ${1} not found." - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:165 --msgid "Determining IP information for ${DEVICE}..." --msgstr "" -- - #: ../systemd/fedora-autorelabel:19 - msgid "*** /etc/selinux/config indicates you want to manually fix labeling" - msgstr "" - --#: ../sysconfig/network-scripts/network-functions:537 -+#: ../sysconfig/network-scripts/network-functions:542 - msgid "WARN " - msgstr "" - -@@ -360,10 +348,6 @@ msgstr "" - msgid "netconsole: can't resolve MAC address of $SYSLOGADDR" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:46 --msgid "ifup-ppp for ${DEVICE} exiting" --msgstr "" -- - #: ../sysconfig/network-scripts/ifdown-routes:5 - msgid "usage: ifdown-routes []" - msgstr "" -@@ -372,7 +356,7 @@ msgstr "" - msgid "Bridge support not available: brctl not found" - msgstr "" - --#: ../rc.d/init.d/network:261 -+#: ../rc.d/init.d/network:234 - msgid "Currently active devices:" - msgstr "" - -@@ -388,7 +372,7 @@ msgstr "" - msgid "Missing parameter 'IPv4 address' (arg 1)" - msgstr "" - --#: ../rc.d/init.d/network:232 -+#: ../rc.d/init.d/network:213 - msgid "Shutting down interface $i: " - msgstr "" - -@@ -432,10 +416,6 @@ msgstr "" - msgid "Missing parameter 'global IPv4 address' (arg 2)" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:74 --msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist" --msgstr "" -- - #: ../rc.d/init.d/netconsole:114 - msgid "netconsole module not loaded" - msgstr "" -@@ -452,10 +432,6 @@ msgstr "" - msgid "6to4 configuration is not valid" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:82 --msgid "Setting up a new ${PEERCONF} config file" --msgstr "" -- - #: ../sysconfig/network-scripts/ifup-aliases:316 - msgid "error in $FILE: IPADDR_START and IPADDR_END don't agree" - msgstr "" -@@ -464,11 +440,7 @@ msgstr "" - msgid "$base $killlevel" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:59 --msgid "adsl-start does not exist or is not executable for ${DEVICE}" --msgstr "" -- --#: ../sysconfig/network-scripts/ifup-eth:167 -+#: ../sysconfig/network-scripts/ifup-eth:181 - msgid " failed; no link present. Check cable?" - msgstr "" - -@@ -480,14 +452,14 @@ msgstr "" - msgid "Device '$device' enabling didn't work" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:77 --msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}" --msgstr "" -- - #: ../sysconfig/network-scripts/network-functions-ipv6:186 - msgid "Cannot add IPv6 address '$address' on dev '$device'" - msgstr "" - -+#: ../service:81 -+msgid "The service command supports only basic LSB actions (start, stop, restart, try-restart, reload, force-reload, status). For other actions, please try to use systemctl." -+msgstr "" -+ - #: ../sysconfig/network-scripts/ifup-ippp:376 - msgid "Warning: link doesn't support IPv6 using encapsulation 'rawip'" - msgstr "" -@@ -508,35 +480,27 @@ msgstr "" - msgid "Disabling netconsole" - msgstr "" - --#: ../systemd/fedora-configure:19 --msgid "Resetting hostname ${HOSTNAME}: " --msgstr "" -- --#: ../rc.d/init.d/network:246 -+#: ../rc.d/init.d/network:219 - msgid "Shutting down loopback interface: " - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:264 --msgid "Erorr adding default gateway for ${REALDEVICE}." --msgstr "" -- - #: ../systemd/fedora-autorelabel:28 - msgid "*** system size and speed of hard drives." - msgstr "" - --#: ../sysconfig/network-scripts/network-functions:531 --msgid "DEBUG " -+#: ../sysconfig/network-scripts/network-functions-ipv6:710 -+msgid "Unsupported selection '$selection' specified (arg 2)" - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:959 - msgid "No reason given for sending trigger to radvd" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ipx:7 --msgid "usage: $0 " -+#: ../service:78 -+msgid "Redirecting to /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE}.service" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:174 ../sysconfig/network-scripts/ifup-eth:288 -+#: ../sysconfig/network-scripts/ifup-eth:188 ../sysconfig/network-scripts/ifup-eth:303 - msgid " done." - msgstr "" - -@@ -560,10 +524,6 @@ msgstr "" - msgid "$STRING" - msgstr "" - --#: ../rc.d/init.d/functions:419 --msgid "${base} dead but subsys locked" --msgstr "" -- - #: ../sysconfig/network-scripts/ifup-aliases:175 - msgid "error in $FILE: already seen ipaddr $IPADDR in $ipseen" - msgstr "" -@@ -572,19 +532,19 @@ msgstr "" - msgid "Stopping $prog (via systemctl): " - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:237 -+#: ../sysconfig/network-scripts/ifup-eth:252 - msgid "Error adding address ${ipaddr[$idx]} for ${DEVICE}." - msgstr "" - --#: ../sysconfig/network-scripts/network-functions-ipv6:710 --msgid "Unsupported selection '$selection' specified (arg 2)" -+#: ../sysconfig/network-scripts/network-functions:536 -+msgid "DEBUG " - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:1014 - msgid "Pidfile '$pidfile' is empty, cannot send trigger to radvd" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:201 -+#: ../sysconfig/network-scripts/ifup-eth:215 - msgid "Failed to bring up ${DEVICE}." - msgstr "" - -@@ -592,7 +552,7 @@ msgstr "" - msgid "Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel" - msgstr "" - --#: ../rc.d/init.d/network:152 -+#: ../rc.d/init.d/network:140 - msgid "Legacy static-route support not available: /sbin/route not found" - msgstr "" - -@@ -612,7 +572,7 @@ msgstr "" - msgid "${base} (pid $pid) is running..." - msgstr "" - --#: ../sysconfig/network-scripts/ifup:96 -+#: ../sysconfig/network-scripts/ifup:97 - msgid "No 802.1Q VLAN support available in kernel for device ${DEVICE}" - msgstr "" - -@@ -620,11 +580,11 @@ msgstr "" - msgid "Given IPv6 default device '$device' doesn't exist or isn't up" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:87 ../sysconfig/network-scripts/ifup-ipv6:198 -+#: ../sysconfig/network-scripts/ifup-ipv6:198 - msgid "Given IPv4 address '$ipv4addr' is not globally usable" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:186 ../sysconfig/network-scripts/ifup-ipv6:289 -+#: ../sysconfig/network-scripts/ifup-ipv6:289 - msgid "Error occurred while calculating the IPv6to4 prefix" - msgstr "" - -@@ -632,11 +592,7 @@ msgstr "" - msgid "Restarting $prog (via systemctl): " - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:45 --msgid "pppd does not exist or is not executable" --msgstr "" -- --#: ../sysconfig/network-scripts/network-functions:534 -+#: ../sysconfig/network-scripts/network-functions:539 - msgid "ERROR " - msgstr "" - --- -1.9.0 - diff --git a/initscripts.spec b/initscripts.spec index 38812a7..b86296a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ -Summary: The inittab file and the /etc/init.d scripts +Summary: Scripts to bring up network interfaces Name: initscripts -Version: 9.55 +Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -35,19 +35,17 @@ BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service %description -The initscripts package contains the basic system scripts used to boot -your Red Hat or Fedora system, change runlevels, and shut the system down -cleanly. Initscripts also contains the scripts that activate and -deactivate most network interfaces. +This package contains the script that activates and deactivates most +network interfaces, some utilities, and other legacy files. %package -n debugmode -Summary: Scripts for running in debugging mode +Summary: Scripts for running in debug mode Requires: initscripts Group: System Environment/Base %description -n debugmode The debugmode package contains some basic scripts that are used to run -the system in a debugging mode. +the system in a debug mode. Currently, this consists of various memory checking code. @@ -71,22 +69,11 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %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 - %post -touch /var/log/wtmp /var/run/utmp /var/log/btmp -chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp -chmod 664 /var/log/wtmp /var/run/utmp -chmod 600 /var/log/btmp - /usr/sbin/chkconfig --add network /usr/sbin/chkconfig --add netconsole if [ $1 -eq 1 ]; then @@ -161,16 +148,13 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/statetab.d /usr/lib/systemd/fedora-* /usr/lib/systemd/system/* -/etc/inittab %dir /etc/rc.d %dir /etc/rc.d/rc[0-9].d /etc/rc[0-9].d %dir /etc/rc.d/init.d /etc/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local -%config(noreplace) /etc/sysctl.conf /usr/lib/sysctl.d/00-system.conf -/etc/sysctl.d/99-sysctl.conf %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig @@ -190,13 +174,10 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 +%doc examples %{!?_licensedir:%global license %%doc} %license COPYING /var/lib/stateless -%ghost %attr(0600,root,utmp) /var/log/btmp -%ghost %attr(0664,root,utmp) /var/log/wtmp -%ghost %attr(0664,root,utmp) /var/run/utmp -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/initscripts.conf %dir /usr/libexec/initscripts @@ -208,8 +189,34 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Sat Aug 16 2014 Fedora Release Engineering - 9.55-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +* Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.56.1-1 +- Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp + +* Tue Oct 07 2014 Lukáš Nykrýn - 9.56-1 +- network_function: return immediately when device is pres +ent +- add configurable DEVTIMEOUT +- fedora-import-state: do not clobber / +- network-functions: grep->fgrep in bonding masters matchi +ng +- man: update sys-unconfig.8 +- rename_devices: comments need to have a blank before them +- add example ifcfg files +- network-functions: improve bonding_masters grep +- ifup: if we were unable to determine DEVICE always call nmcli up +- ifup-tunnel: call ifup-ipv6 in the end +- ifup: also set multicast_snooping after the bridge is up +- network-functions: ETHTOOL_DELAY introduction patch +- use pie and relro by default +- custom naming for VLAN devices +- vi.po: fix parentheses +- ifup-wireless: add support for wowlan +- ifup-wireless: add support for wowlan (second part) +- ifup-aliases: do not bring up ipv6 for range files +- sys-unconfig: use poweroff instead of halt +- ifup-aliases: improve duplicate address detection +- network-functions: handle BONDING_OPTS better +- network: tell nm to wake the slaves * Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 - fix license handling diff --git a/sources b/sources index 566d078..abecb85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0672f648a9ee8607a2df65835c54f5e5 initscripts-9.55.tar.bz2 +8ca2abb3877e8019a5e726c25501e8e3 initscripts-9.56.1.tar.bz2 From ae68266e969f98636bdc15ee6b9d691f4581aa1e Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 13 Oct 2014 16:39:20 +0200 Subject: [PATCH 05/10] 9.56.1-2 --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index b86296a..19df947 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -14,7 +14,7 @@ Requires: module-init-tools Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: procps-ng >= 3.3.8-16 -Conflicts: systemd < 23-1 +Conflicts: systemd < 216-3 Conflicts: systemd-units < 23-1 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Oct 13 2014 Lukáš Nykrýn - 9.56.1-2 +- Conflict with older systemd due to move of files + * Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.56.1-1 - Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp From cbeaca54b780698a7a1954c61523af7bbaef69f7 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 6 Nov 2014 10:50:09 +0100 Subject: [PATCH 06/10] ifup,vlan: fix typo --- 0001-ifup-vlan-fix-typo.patch | 25 +++++++++++++++++++++++++ initscripts.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-ifup-vlan-fix-typo.patch diff --git a/0001-ifup-vlan-fix-typo.patch b/0001-ifup-vlan-fix-typo.patch new file mode 100644 index 0000000..30ece47 --- /dev/null +++ b/0001-ifup-vlan-fix-typo.patch @@ -0,0 +1,25 @@ +From ca531a88a9dfb8675a908bae8af49e81f061baef Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Tue, 8 Jul 2014 13:18:29 +0200 +Subject: [PATCH] ifup,vlan: fix typo + +--- + sysconfig/network-scripts/ifup | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup +index f2a1c8f..911707e 100755 +--- a/sysconfig/network-scripts/ifup ++++ b/sysconfig/network-scripts/ifup +@@ -76,7 +76,7 @@ fi + + # Ethernet 802.1Q VLAN support + if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -n $DEVICE ]; then +- if [ -n ${VID} ]; then ++ if [ -n "${VID}" ]; then + if test -z "$PHYSDEV"; then + net_log $"PHYSDEV should be set for device ${DEVICE}" + exit 1 +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index 19df947..f46403a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 3%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,6 +34,8 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service +Patch1: 0001-ifup-vlan-fix-typo.patch + %description This package contains the script that activates and deactivates most network interfaces, some utilities, and other legacy files. @@ -51,6 +53,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch1 -p1 %build make @@ -189,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Nov 06 2014 Lukáš Nykrýn - 9.56.1-3 +- ifup,vlan: fix typo + * Mon Oct 13 2014 Lukáš Nykrýn - 9.56.1-2 - Conflict with older systemd due to move of files From 9595b0b3dab45b55a50fe6ce911f283e26a1fb94 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 12 Nov 2014 13:04:32 +0100 Subject: [PATCH 07/10] adjust LINKDELAY when STP is on (#1162822) --- 0001-adjust-LINKDELAY-when-STP-is-on.patch | 63 ++++++++++++++++++++++ initscripts.spec | 7 ++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 0001-adjust-LINKDELAY-when-STP-is-on.patch diff --git a/0001-adjust-LINKDELAY-when-STP-is-on.patch b/0001-adjust-LINKDELAY-when-STP-is-on.patch new file mode 100644 index 0000000..e08f242 --- /dev/null +++ b/0001-adjust-LINKDELAY-when-STP-is-on.patch @@ -0,0 +1,63 @@ +From 6708502ce8724feb143e5a97af43687cec901c99 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Tue, 11 Nov 2014 14:13:22 -0500 +Subject: [PATCH] adjust LINKDELAY when STP is on + +This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1162822 + +When ifup is called on an interface that has BOOTPROTO=dhcp, ifup-eth +will call network-functions:check_link_down() to wait for carrier on +the interface before starting dhclient. If the interface happens to be +a bridge device, carrier will not come on until at least one attached +device is in "forwarding" mode. If the bridge has STP enabled, it +takes at least $DELAY * 2 + 5 seconds (sometimes slightly longer) for +any attached device to go into forwarding mode. + +However, check_link_down() will only wait for max(${LINKDELAY}, 5) +seconds for carrier, and there are *many* existing configs that have +STP enabled but no setting for LINKDELAY. Every one of those configs +will now fail to ifup the bridge device. + +The solution implemented in this patch is for ifup-eth to set +LINKDELAY to at least ${DELAY} * 2 + 7 when the device is a bridge an +STP is enabled. Since check_link_down() returns within .5 sec of +carrier coming up, the worst effect this could have would be to take +longer to fail in the case of a config where carrier was *never* going +to come up. Otherwise, it will not create any more delay than is +already present in cases that currently work, and will cause many +other configs to become unbroken. +--- + sysconfig/network-scripts/ifup-eth | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth +index c8154dc..1ee026b 100755 +--- a/sysconfig/network-scripts/ifup-eth ++++ b/sysconfig/network-scripts/ifup-eth +@@ -1,6 +1,6 @@ + #!/bin/bash + # Network Interface Configuration System +-# Copyright (c) 1996-2010 Red Hat, Inc. all rights reserved. ++# Copyright (c) 1996-2014 Red Hat, Inc. all rights reserved. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License, version 2, +@@ -64,6 +64,15 @@ if [ "${TYPE}" = "Bridge" ]; then + value=${arg##*=}; + echo $value > /sys/class/net/${DEVICE}/bridge/$key + done ++ # set LINKDELAY (used as timeout when calling check_link_down()) ++ # to at least (${DELAY} * 2) + 7 if STP is enabled. This is the ++ # minimum time required for /sys/class/net/$REALDEVICE/carrier to ++ # become 1 after "ip link set dev $DEVICE up" is called. ++ if [ "${STP}" = "yes" -o "${STP}" = "on" ]; then ++ TMPD=7 ++ [ -n "${DELAY}" ] && TMPD=$(expr ${DELAY} \* 2 + ${TMPD}) ++ [ 0$LINKDELAY -lt $TMPD ] && LINKDELAY=$TMPD ++ fi + fi + + # Create tap device. +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index f46403a..eeccc69 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 3%{?dist} +Release: 4%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -35,6 +35,7 @@ BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service Patch1: 0001-ifup-vlan-fix-typo.patch +Patch2: 0001-adjust-LINKDELAY-when-STP-is-on.patch %description This package contains the script that activates and deactivates most @@ -54,6 +55,7 @@ Currently, this consists of various memory checking code. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build make @@ -192,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Nov 12 2014 Lukáš Nykrýn - 9.56.1-4 +- adjust LINKDELAY when STP is on (#1162822) + * Thu Nov 06 2014 Lukáš Nykrýn - 9.56.1-3 - ifup,vlan: fix typo From 46cfc6f527a8963acae51237e24da6864486d1ee Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 8 Dec 2014 13:54:15 +0100 Subject: [PATCH 08/10] improve check for bond_master in install bonding driver --- ...r_bond_master_in_install_bonding_dri.patch | 56 +++++++++++++++++++ initscripts.spec | 7 ++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 0001-improve_check_for_bond_master_in_install_bonding_dri.patch diff --git a/0001-improve_check_for_bond_master_in_install_bonding_dri.patch b/0001-improve_check_for_bond_master_in_install_bonding_dri.patch new file mode 100644 index 0000000..cdd1e0d --- /dev/null +++ b/0001-improve_check_for_bond_master_in_install_bonding_dri.patch @@ -0,0 +1,56 @@ +From 30ecd15eb772de10f9c2f94cc9bad4eac5439d24 Mon Sep 17 00:00:00 2001 +From: Ashish Samant +Date: Wed, 29 Oct 2014 17:47:29 -0700 +Subject: [PATCH] improve_check_for_bond_master_in_install_bonding_driver + +The current grep check (fgrep -sqx) in install_bonding_driver, to determine +whether bond master exists, fails when there are multiple bond masters. +The fix assumes that multiple bond masters are on different lines in the file +"/sys/class/net/bonding_masters", while they are in fact on the same line. +Since fgrep -sqx checks for the entire line,it will never match any one bond +master within the line and always fail if there are multiple bonds. + +This patch improves the check by creating a new function, bond_master_exists() +to handle this and other conditions. + +Orabug: 19897586 + +Signed-off-by: Ashish Samant +Signed-off-by: John Haxby +Acked-by: Mukesh Kacker +--- + sysconfig/network-scripts/network-functions | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 0e86efd..e6273bb 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -458,10 +458,22 @@ phy_wireless_device () + cat /sys/class/net/$1/phy80211/name + } + ++bond_master_exists () ++{ ++ local bond_name ++ [ -z "${1}" ] && return 1 ++ [ ! -f /sys/class/net/bonding_masters ] && return 1 ++ ++ for bond_name in $(< /sys/class/net/bonding_masters); do ++ [ "${bond_name}" == "${1}" ] && return 0 ++ done ++ return 1 ++} ++ + install_bonding_driver () + { +- [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 ) +- if ! fgrep -sqx "$1" /sys/class/net/bonding_masters; then ++ if ! bond_master_exists ${1}; then ++ modprobe bonding || return 1 + echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null + fi + ( +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index eeccc69..1d55d80 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 4%{?dist} +Release: 5%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -36,6 +36,7 @@ Provides: /sbin/service Patch1: 0001-ifup-vlan-fix-typo.patch Patch2: 0001-adjust-LINKDELAY-when-STP-is-on.patch +Patch3: 0001-improve_check_for_bond_master_in_install_bonding_dri.patch %description This package contains the script that activates and deactivates most @@ -56,6 +57,7 @@ Currently, this consists of various memory checking code. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make @@ -194,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Dec 08 2014 Lukáš Nykrýn - 9.56.1-5 +- improve check for bond_master in install bonding driver + * Wed Nov 12 2014 Lukáš Nykrýn - 9.56.1-4 - adjust LINKDELAY when STP is on (#1162822) From 7ac5618bae1a6de3fb3f0aa1389ce7c70bddbc35 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 16 Dec 2014 15:02:01 +0100 Subject: [PATCH 09/10] ifdown-ipv6: reset addrgenmode to eui64 for device ifup: fix typo --- ...eset-addrgenmode-to-eui64-for-device.patch | 24 ++++++++++++++++++ 0001-ifup-fix-typo.patch | 25 +++++++++++++++++++ initscripts.spec | 10 +++++++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch create mode 100644 0001-ifup-fix-typo.patch diff --git a/0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch b/0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch new file mode 100644 index 0000000..ae7ef6f --- /dev/null +++ b/0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch @@ -0,0 +1,24 @@ +From 7e548d51df2b8df098bc7584ad75258ac7064509 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Tue, 16 Dec 2014 14:12:36 +0100 +Subject: [PATCH] ifdown-ipv6: reset addrgenmode to eui64 for device + +--- + sysconfig/network-scripts/ifdown-ipv6 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6 +index 7bfcfb3..d2207b7 100755 +--- a/sysconfig/network-scripts/ifdown-ipv6 ++++ b/sysconfig/network-scripts/ifdown-ipv6 +@@ -66,6 +66,7 @@ fi + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.forwarding=0 >/dev/null 2>&1 + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_ra=0 >/dev/null 2>&1 + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_redirects=0 >/dev/null 2>&1 ++/sbin/ip link set $DEVICE addrgenmode eui64 >/dev/null 2>&1 + + # Test status of tun6to4 device + ipv6_test_device_status tun6to4 +-- +1.8.3.1 + diff --git a/0001-ifup-fix-typo.patch b/0001-ifup-fix-typo.patch new file mode 100644 index 0000000..234c78e --- /dev/null +++ b/0001-ifup-fix-typo.patch @@ -0,0 +1,25 @@ +From 2444fc5a4060e4f78059b1bff9fa37a10b6fd648 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Tue, 16 Dec 2014 12:14:08 +0100 +Subject: [PATCH] ifup: fix typo + +--- + sysconfig/network-scripts/ifup | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup +index 911707e..bb58685 100755 +--- a/sysconfig/network-scripts/ifup ++++ b/sysconfig/network-scripts/ifup +@@ -90,7 +90,7 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -n $DEVICE ]; then + fi + MATCH='^vlan[0-9]{1,4}?' + if [[ "${DEVICE}" =~ $MATCH ]]; then +- VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//'): ++ VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//') + # PHYSDEV should be set in ifcfg-vlan* file + if test -z "$PHYSDEV"; then + net_log $"PHYSDEV should be set for device ${DEVICE}" +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index 1d55d80..d1af583 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 5%{?dist} +Release: 6%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -37,6 +37,8 @@ Provides: /sbin/service Patch1: 0001-ifup-vlan-fix-typo.patch Patch2: 0001-adjust-LINKDELAY-when-STP-is-on.patch Patch3: 0001-improve_check_for_bond_master_in_install_bonding_dri.patch +Patch4: 0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch +Patch5: 0001-ifup-fix-typo.patch %description This package contains the script that activates and deactivates most @@ -58,6 +60,8 @@ Currently, this consists of various memory checking code. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build make @@ -196,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Dec 16 2014 Lukáš Nykrýn - 9.56.1-6 +- ifdown-ipv6: reset addrgenmode to eui64 for device +- ifup: fix typo + * Mon Dec 08 2014 Lukáš Nykrýn - 9.56.1-5 - improve check for bond_master in install bonding driver From 7cc74e76e24ee1105331d42928e4ba8584a275b4 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 24 Feb 2015 09:57:24 +0100 Subject: [PATCH 10/10] network-functions: is_available_wait should wait even in the case that is_available returns 2 --- ...s-is_available_wait-should-wait-even.patch | 38 +++++++++++++++++++ initscripts.spec | 8 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-network-functions-is_available_wait-should-wait-even.patch diff --git a/0001-network-functions-is_available_wait-should-wait-even.patch b/0001-network-functions-is_available_wait-should-wait-even.patch new file mode 100644 index 0000000..327f06e --- /dev/null +++ b/0001-network-functions-is_available_wait-should-wait-even.patch @@ -0,0 +1,38 @@ +From 1f230a3d2e2733e30577c91645005801ab2c0f40 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Mon, 12 Jan 2015 12:49:46 +0100 +Subject: [PATCH] network-functions: is_available_wait should wait even in the + case that is_available returns 2 + +--- + sysconfig/network-scripts/network-functions | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 1ecbcfc..9a5e359 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -336,18 +336,16 @@ is_available_wait () + + local retry=${2##*[!0-9]*} + +- is_available $1 ++ is_available $1 && return 0 + ret=$? + +- [ 0"$ret" -ne 1 ] && return $ret +- + while [ 0"$retry" -gt 0 ]; do + sleep 1 + [ -d "/sys/class/net/$1" ] && return 0 + retry=$(($retry -1)) + done + +- return 1 ++ return $ret + } + + need_hostname () +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index d1af583..e418b12 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 6%{?dist} +Release: 7%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -39,6 +39,7 @@ Patch2: 0001-adjust-LINKDELAY-when-STP-is-on.patch Patch3: 0001-improve_check_for_bond_master_in_install_bonding_dri.patch Patch4: 0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch Patch5: 0001-ifup-fix-typo.patch +Patch6: 0001-network-functions-is_available_wait-should-wait-even.patch %description This package contains the script that activates and deactivates most @@ -62,6 +63,7 @@ Currently, this consists of various memory checking code. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build make @@ -200,6 +202,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Feb 24 2015 Lukáš Nykrýn - 9.56.1-7 +- network-functions: is_available_wait should wait even in the case that + is_available returns 2 + * Tue Dec 16 2014 Lukáš Nykrýn - 9.56.1-6 - ifdown-ipv6: reset addrgenmode to eui64 for device - ifup: fix typo