Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Bill Nottingham
6de3d3e770 9.30.1-1 2011-10-12 16:39:57 -04:00
Bill Nottingham
b8229bcfc4 Fix 05-netfs for systemd. 2011-04-27 15:35:04 -04:00
4 changed files with 32 additions and 3 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
/initscripts-9.30.tar.bz2
/initscripts-9.30.1.tar.bz2

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

@ -4,7 +4,7 @@
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
@ -245,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
@ -314,6 +315,16 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug*
%changelog
* Wed Oct 12 2011 Bill Nottingham <notting@redhat.com> - 9.30.1-1
- netconsole: only use the first ARP response (#744309, <doug.knight@karmix.org>)
- assorted: plymouth lives in /bin (#702814)
- ifdown-eth: fix dhclient pid file for IPv6 (#729292, <daveg@dgit.ndo.co.uk>)
- console_*: add freescale ttymx ports (#728730, <ndevos@redhat.com>)
- 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 <notting@redhat.com> - 9.30-1
- ifup-eth: handle IPADDRx correctly for static addresses (#697838)
- systemd: fix storage setup service after cryptsetup.target (#699918)

View file

@ -1 +1 @@
504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2
398db4f62acdaec5cd18e1ac2b6ebca4 initscripts-9.30.1.tar.bz2