Fix 05-netfs for systemd.

This commit is contained in:
Bill Nottingham 2011-04-27 15:35:04 -04:00
commit b8229bcfc4
2 changed files with 23 additions and 2 deletions

View file

@ -0,0 +1,18 @@
commit 046a3ba411cc66eefcfe7d9a598e7960784e18e9
Author: Bill Nottingham <notting@redhat.com>
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 || {

View file

@ -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 <notting@redhat.com> - 9.30-1
* Wed Apr 27 2011 Bill Nottingham <notting@redhat.com> - 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 (<rstrode@redhat.com>)
@ -323,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT
- 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)
- 05-netfs: fix for systemd
* Wed Apr 06 2011 Bill Nottingham <notting@redhat.com> - 9.29-1
- systemd: add a storage setup service after cryptsetup.target (#692198)