From b8229bcfc458b73be58a82fdde32d620cd936263 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 15:35:04 -0400 Subject: [PATCH 1/2] Fix 05-netfs for systemd. --- 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch | 18 ++++++++++++++++++ initscripts.spec | 7 +++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch diff --git a/046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch b/046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch new file mode 100644 index 0000000..e0daa29 --- /dev/null +++ b/046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch @@ -0,0 +1,18 @@ +commit 046a3ba411cc66eefcfe7d9a598e7960784e18e9 +Author: Bill Nottingham +Date: Wed Apr 27 15:31:11 2011 -0400 + + Don't redirect to systemctl, as 'start' in that case won't try to start it again. + +diff --git a/NetworkManager/dispatcher.d/05-netfs b/NetworkManager/dispatcher.d/05-netfs +index 655c87a..bd55846 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 || { diff --git a/initscripts.spec b/initscripts.spec index 858afd1..35eb817 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.30 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -59,6 +59,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch %description The initscripts package contains the basic system scripts used to boot @@ -88,6 +89,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 %build make @@ -314,7 +316,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Apr 27 2011 Bill Nottingham - 9.30-1 +* Wed Apr 27 2011 Bill Nottingham - 9.30-2 - 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 () @@ -323,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT - network-functions: fix IPADDRx index handling () - ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, ) - ifup-eth: ensure bond exists before bringing up slaves (#694501) +- 05-netfs: fix for systemd * Wed Apr 06 2011 Bill Nottingham - 9.29-1 - systemd: add a storage setup service after cryptsetup.target (#692198) From 6de3d3e770a708d4a07fa514a3c1250ed95bef79 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 16:39:57 -0400 Subject: [PATCH 2/2] 9.30.1-1 --- .gitignore | 2 +- initscripts.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bed8bc2..986b73b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.30.tar.bz2 +/initscripts-9.30.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 35eb817..ec7bab5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,11 +4,11 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.30 +Version: 9.30.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -59,7 +59,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch %description The initscripts package contains the basic system scripts used to boot @@ -89,7 +88,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 %build make @@ -247,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT /etc/rc.d/init.d/* %exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/reboot +%exclude /etc/rc.d/rc[0-9].d/*single %exclude /etc/rc.d/init.d/single %config(noreplace) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf @@ -316,7 +315,17 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Apr 27 2011 Bill Nottingham - 9.30-2 +* Wed Oct 12 2011 Bill Nottingham - 9.30.1-1 +- netconsole: only use the first ARP response (#744309, ) +- assorted: plymouth lives in /bin (#702814) +- ifdown-eth: fix dhclient pid file for IPv6 (#729292, ) +- console_*: add freescale ttymx ports (#728730, ) +- rwtab: update for systemd (#704783) +- lang.csh/debug.csh: fix character classes +- 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) + +* Wed Apr 27 2011 Bill Nottingham - 9.30-1 - ifup-eth: handle IPADDRx correctly for static addresses (#697838) - systemd: fix storage setup service after cryptsetup.target (#699918) - prefdm: tweak how plymouth is quit in the gdm/kdm case () @@ -325,7 +334,6 @@ rm -rf $RPM_BUILD_ROOT - network-functions: fix IPADDRx index handling () - ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, ) - ifup-eth: ensure bond exists before bringing up slaves (#694501) -- 05-netfs: fix for systemd * Wed Apr 06 2011 Bill Nottingham - 9.29-1 - systemd: add a storage setup service after cryptsetup.target (#692198) diff --git a/sources b/sources index a6e7960..7d11e8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2 +398db4f62acdaec5cd18e1ac2b6ebca4 initscripts-9.30.1.tar.bz2