From b98c871ea01b562839774bece40b60b48e3e5f39 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 08:00:07 +0000 Subject: [PATCH 001/209] Initialize branch F-11 for initscripts --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 58e823bc0fbc9cc8f526ad4c5e0e47411f60aea3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 1 May 2009 20:37:53 +0000 Subject: [PATCH 002/209] 8.95-1 --- .cvsignore | 2 +- initscripts.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 825505b..e27e8cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.94.tar.bz2 +initscripts-8.95.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 2ac3128..d1f7bf6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.94 +Version: 8.95 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -249,6 +249,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri May 1 2009 Bill Nottingham - 8.95-1 +- don't kill runlevel events on subsequent entering of the same runlevel (#498514) +- lang.*sh: handle spaces in $HOME (#498482) +- network-functions: explicitly source from the proper directory. (#496233) +- remove persistent names on sys-unconfig. (#448322) +- init.d/functions: cgexec has moved to /bin (#495715) +- allow changing of VLAN type even if the module is already loaded. (#495053, ) +- translation updates: fr, ml, pt + * Tue Apr 7 2009 Bill Nottingham - 8.94-1 - prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461) - translation updates; bn, de, pt, ru, te diff --git a/sources b/sources index 178935a..f79889b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb0ee36cf2b695a669bb9efae0d67cb4 initscripts-8.94.tar.bz2 +b3c74ef959cf07dd6f9ba4fa878bd559 initscripts-8.95.tar.bz2 From 700aa58ea7c101e98e08cb6a69af7f5238056c94 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 4 Jun 2009 19:05:08 +0000 Subject: [PATCH 003/209] sync with F-11 --- .cvsignore | 2 +- initscripts.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 825505b..e27e8cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.94.tar.bz2 +initscripts-8.95.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 2ac3128..d1f7bf6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.94 +Version: 8.95 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -249,6 +249,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri May 1 2009 Bill Nottingham - 8.95-1 +- don't kill runlevel events on subsequent entering of the same runlevel (#498514) +- lang.*sh: handle spaces in $HOME (#498482) +- network-functions: explicitly source from the proper directory. (#496233) +- remove persistent names on sys-unconfig. (#448322) +- init.d/functions: cgexec has moved to /bin (#495715) +- allow changing of VLAN type even if the module is already loaded. (#495053, ) +- translation updates: fr, ml, pt + * Tue Apr 7 2009 Bill Nottingham - 8.94-1 - prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461) - translation updates; bn, de, pt, ru, te diff --git a/sources b/sources index 178935a..f79889b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb0ee36cf2b695a669bb9efae0d67cb4 initscripts-8.94.tar.bz2 +b3c74ef959cf07dd6f9ba4fa878bd559 initscripts-8.95.tar.bz2 From c43d94e9c40311093269671876cfa79cd53547c0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 03:23:44 +0000 Subject: [PATCH 004/209] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index d1f7bf6..2366036 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,7 +6,7 @@ Version: 8.95 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +Release: 2 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 @@ -249,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 8.95-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri May 1 2009 Bill Nottingham - 8.95-1 - don't kill runlevel events on subsequent entering of the same runlevel (#498514) - lang.*sh: handle spaces in $HOME (#498482) From f50455f8525268fe30bf4df72e70849cd3a51aa3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 3 Aug 2009 21:10:21 +0000 Subject: [PATCH 005/209] 8.96-1 --- .cvsignore | 2 +- initscripts.spec | 29 +++++++++++++++++++++-------- sources | 2 +- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index e27e8cf..6d9c615 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.95.tar.bz2 +initscripts-8.96.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 2366036..3b5f60d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,18 +2,18 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.95 +Version: 8.96 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2 +Release: 1 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 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog Requires: /sbin/fuser, /bin/grep -Requires: /sbin/pidof +Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 @@ -87,11 +87,13 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-iucv \ $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ - $RPM_BUILD_ROOT/lib/udev/ccw_init + $RPM_BUILD_ROOT/lib/udev/ccw_init \ + $RPM_BUILD_ROOT/etc/event.d/console %else rm -f \ $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \ - $RPM_BUILD_ROOT/etc/sysconfig/init.s390 + $RPM_BUILD_ROOT/etc/sysconfig/init.s390 \ + $RPM_BUILD_ROOT/etc/event.d/tty[1-6] %endif %pre @@ -237,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport /etc/NetworkManager/dispatcher.d/05-netfs -%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d +%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp @@ -249,8 +251,19 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Fri Jul 24 2009 Fedora Release Engineering - 8.95-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Mon Aug 3 2009 Bill Nottingham - 8.96-1 +- fix up upstart rules for s390(x). (#515222) +- leave ChangeLog in the tarball only. (#515012) +- disable netfilter on bridged interfaces. (#512206) +- assorted shell-related cleanups to ipv6 and other code () +- use resolv.conf from dracut netboot before setting hostname. (#514801, ) +- ipcalc updates () +- only use ethtool for link checking; no more mii-tool +- require /sbin/blkid directly, as it moves between packages (#508413) +- redirect bash errors on 'unset' to /dev/null. (#482888) +- fix dmraid partition naming (#501476, ) +- don't quote upstart signals. (#501155) +- translation updates: bn_IN, da, es, sk * Fri May 1 2009 Bill Nottingham - 8.95-1 - don't kill runlevel events on subsequent entering of the same runlevel (#498514) diff --git a/sources b/sources index f79889b..4873931 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3c74ef959cf07dd6f9ba4fa878bd559 initscripts-8.95.tar.bz2 +569af6fd0a1a3988a9e60963eeacaaa2 initscripts-8.96.tar.bz2 From 5b702a94de756b7f7939ad5d2c9b43ffb508626e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 10 Aug 2009 21:13:34 +0000 Subject: [PATCH 006/209] 8.97-1 --- .cvsignore | 2 +- initscripts.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6d9c615..7100205 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.96.tar.bz2 +initscripts-8.97.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 3b5f60d..b2e503a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.96 +Version: 8.97 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -251,6 +251,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Aug 10 2009 Bill Nottingham - 8.97-1 +- ipcalc: fix IPv6 address checking (#516319) +- ifup-aliases: fix syntax error from earlier cleanups. (#515612, ) +- translation updates: nb +- rc.sysinit: remove useless call to pam_console_apply + * Mon Aug 3 2009 Bill Nottingham - 8.96-1 - fix up upstart rules for s390(x). (#515222) - leave ChangeLog in the tarball only. (#515012) diff --git a/sources b/sources index 4873931..8019283 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -569af6fd0a1a3988a9e60963eeacaaa2 initscripts-8.96.tar.bz2 +24b32543443055f6e1374496bfda5187 initscripts-8.97.tar.bz2 From 8718885ea2ef306ec04ee5523d96916f923122e3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 2 Sep 2009 21:38:27 +0000 Subject: [PATCH 007/209] 8.98-1 --- .cvsignore | 2 +- initscripts.spec | 18 +++++++++++++++--- sources | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7100205..9afc6b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.97.tar.bz2 +initscripts-8.98.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index b2e503a..ba3c66d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.97 +Version: 8.98 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -15,7 +15,7 @@ Requires: /sbin/sysctl, syslog Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools -Requires: util-linux >= 2.10s-11, mount >= 2.11l +Requires: util-linux-ng >= 2.16, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart Requires: upstart @@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 125-1 Requires: popt >= 1.12-2 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3 +Conflicts: mkinitrd < 4.0, kernel < 2.6.31, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 @@ -251,6 +251,18 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Sep 2 2009 Bill Nottingham - 8.98-1 +- sysconfig.txt: doucment DHCP_HOSTNAME (#498052) +- 88-clock.rules: Use --systz instead of --hctosys. (#517886, #489494) +- Support rwtab and state passed from dracut initrd (#515771, ) +- restore context of *tmp files (#519748) +- halt: don't try and save mixer settings if it's not writable. (#515771) +- rwtab: add /var/spool, /var/lib/dbus, others (#494973, #515771) +- sysconfig.txt: clarify docs (#518614) +- rc.sysinit: don't pretend /selinux is configurable (#518164) +- assorted ipv6 redundant code deletion +- translation updates: bn, ca, d, es, fi, fr, gu, hi, it, ja, ko, ml, nb, nl, pl, pt, pt_BR, ru, sr, ta, zh_CN, zh_TW + * Mon Aug 10 2009 Bill Nottingham - 8.97-1 - ipcalc: fix IPv6 address checking (#516319) - ifup-aliases: fix syntax error from earlier cleanups. (#515612, ) diff --git a/sources b/sources index 8019283..b8ea953 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24b32543443055f6e1374496bfda5187 initscripts-8.97.tar.bz2 +bc4ed1f39917bab795140bfaeccae18c initscripts-8.98.tar.bz2 From 4c54c616952902bc4c88ac4ad959dd644c50b707 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 4 Sep 2009 18:27:26 +0000 Subject: [PATCH 008/209] Tweak conflict. --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index ba3c66d..6b3ac74 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,7 +6,7 @@ Version: 8.98 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +Release: 1.1 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 @@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 125-1 Requires: popt >= 1.12-2 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.31, mdadm < 2.6.4-3 +Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 @@ -251,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Sep 4 2009 Bill Nottingham - 8.98-1.1 +- tweak kernel conflict + * Wed Sep 2 2009 Bill Nottingham - 8.98-1 - sysconfig.txt: doucment DHCP_HOSTNAME (#498052) - 88-clock.rules: Use --systz instead of --hctosys. (#517886, #489494) From 7ba6026d8af1b789514e4136caff2b7106dad09b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 14 Sep 2009 16:41:34 +0000 Subject: [PATCH 009/209] 8.99-1 --- .cvsignore | 2 +- initscripts.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9afc6b5..1ffda16 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.98.tar.bz2 +initscripts-8.99.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 6b3ac74..6aa028b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,11 +2,11 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.98 +Version: 8.99 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1.1 +Release: 1 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 @@ -251,8 +251,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Fri Sep 4 2009 Bill Nottingham - 8.98-1.1 +* Mon Sep 14 2009 Bill Nottingham - 8.99-1 +- init.d/functions: add a '-l' option to status to pass lock file name (#521772) - tweak kernel conflict +- translation updates: as, bn_IN, de, fr, hi, it, hu, kn, mr, or, pa, pt, ru, te * Wed Sep 2 2009 Bill Nottingham - 8.98-1 - sysconfig.txt: doucment DHCP_HOSTNAME (#498052) @@ -264,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT - sysconfig.txt: clarify docs (#518614) - rc.sysinit: don't pretend /selinux is configurable (#518164) - assorted ipv6 redundant code deletion -- translation updates: bn, ca, d, es, fi, fr, gu, hi, it, ja, ko, ml, nb, nl, pl, pt, pt_BR, ru, sr, ta, zh_CN, zh_TW +- translation updates: bn, ca, de, es, fi, fr, gu, hi, it, ja, ko, ml, nb, nl, pl, pt, pt_BR, ru, sr, ta, zh_CN, zh_TW * Mon Aug 10 2009 Bill Nottingham - 8.97-1 - ipcalc: fix IPv6 address checking (#516319) diff --git a/sources b/sources index b8ea953..70c0b01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc4ed1f39917bab795140bfaeccae18c initscripts-8.98.tar.bz2 +ec294a0d68f6a14c1b6f3cf507a48aad initscripts-8.99.tar.bz2 From 65b02a22220781428c3fb3500b71eb690334f169 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Oct 2009 02:54:34 +0000 Subject: [PATCH 010/209] Fix typo from bad import script. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 578df4e..6152ae2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := initscripts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ed997153ede02445019e54f47ab4039534069673 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Oct 2009 02:54:44 +0000 Subject: [PATCH 011/209] Fix typo from bad import script. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 578df4e..6152ae2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := initscripts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 526d3753d9c80b150feb22be4e18f8fc82f760e6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Sat, 5 Dec 2009 15:10:59 +0000 Subject: [PATCH 012/209] 8.95.1-1 --- .cvsignore | 2 +- initscripts.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e27e8cf..d8f1a70 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.95.tar.bz2 +initscripts-8.95.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d1f7bf6..0e267ab 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.95 +Version: 8.95.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -249,6 +249,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Dec 4 2009 Bill Nottingham - 8.95.1-1 +- halt: don't try and save mixer settings if it's not writable. (#515771) +- rc.sysinit: restore context of recreated files. (#519748) +- remove never-used 'sulogin' upstart event +- rc, functions/rc1: redirect bash errors on 'unset' to /dev/null. (#482888) +- rc.sysinit: fix dmraid partition naming (#501476, ) +- rc: don't quote upstart signals. (#501155) + * Fri May 1 2009 Bill Nottingham - 8.95-1 - don't kill runlevel events on subsequent entering of the same runlevel (#498514) - lang.*sh: handle spaces in $HOME (#498482) diff --git a/sources b/sources index f79889b..af960ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3c74ef959cf07dd6f9ba4fa878bd559 initscripts-8.95.tar.bz2 +1164e222fb37a80005038992c6f13189 initscripts-8.95.1.tar.bz2 From 1d6c09596e7d5b303dcf30b99db5c4eb99375fc3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 9 Dec 2009 21:27:27 +0000 Subject: [PATCH 013/209] 9.03-1 --- .cvsignore | 2 +- initscripts.spec | 58 +++++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1ffda16..7a2b253 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.99.tar.bz2 +initscripts-9.03.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 6aa028b..3bedab1 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.99 +Version: 9.03 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,8 +17,9 @@ Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools Requires: util-linux-ng >= 2.16, mount >= 2.11l Requires: bash >= 3.0 +Requires: sysvinit-tools >= 2.87 %if with_upstart -Requires: upstart +Requires: upstart >= 0.6.0 %else Requires: SysVinit >= 2.85-38 %endif @@ -74,26 +75,21 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %if with_upstart mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab - rm -f $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S99single - rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single %else mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab - rm -rf $RPM_BUILD_ROOT/etc/event.d + rm -rf $RPM_BUILD_ROOT/etc/init %endif rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ - $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-iucv \ $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ - $RPM_BUILD_ROOT/lib/udev/ccw_init \ - $RPM_BUILD_ROOT/etc/event.d/console + $RPM_BUILD_ROOT/lib/udev/ccw_init %else rm -f \ $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \ - $RPM_BUILD_ROOT/etc/sysconfig/init.s390 \ - $RPM_BUILD_ROOT/etc/event.d/tty[1-6] + $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif %pre @@ -175,7 +171,6 @@ rm -rf $RPM_BUILD_ROOT /etc/sysconfig/network-scripts/net.hotplug %ifarch s390 s390x /etc/sysconfig/network-scripts/ifup-ctc -/etc/sysconfig/network-scripts/ifup-iucv %endif %config(noreplace) /etc/networks /etc/rwtab @@ -183,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT /etc/statetab %dir /etc/statetab.d %if with_upstart -%config(noreplace) /etc/event.d/* +/etc/init/* %endif %config /etc/X11/prefdm %config(noreplace) /etc/inittab @@ -204,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/* /usr/sbin/sys-unconfig /sbin/setsysfont -/bin/doexec /bin/ipcalc /bin/usleep %attr(4755,root,root) /usr/sbin/usernetctl @@ -214,7 +208,6 @@ rm -rf $RPM_BUILD_ROOT /sbin/getkey /sbin/securetty %attr(2755,root,root) /sbin/netreport -/sbin/initlog /lib/udev/rules.d/* /lib/udev/rename_device /lib/udev/console_init @@ -234,12 +227,11 @@ rm -rf $RPM_BUILD_ROOT /etc/ppp/ip-down.ipv6to4 /etc/ppp/ipv6-up /etc/ppp/ipv6-down -%config(noreplace) /etc/initlog.conf %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport /etc/NetworkManager/dispatcher.d/05-netfs -%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d +%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp @@ -251,6 +243,40 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Dec 9 2009 Bill Nottingham - 9.03-1 +- migrate to upstart 0.6.x (, ) +-- jobs move to /etc/init +-- collapse rcX and ttyX jobs into single job definitions +-- jobs are no longer %%config +- remove obsolete doexec command +- rc.sysinit: handle yet another random return string from dmraid +- remove never-used 'sulogin' upstart event +- fix time-setting udev rules for old-style RTC devices (#537595) +- init.d/network: keep error codes limited to '1'. (#537841) +- add initial ifup/ifdown man pages. (#529328, ) + +* Tue Oct 27 2009 Bill Nottingham - 9.02-1 +- remove long-since deprecated initlog +- remove IUCV support (#507217) +- halt: put a wrapper around killall5 to account for retval 2 not being an error (#526539, ) +- ifup-eth: honor DEFROUTE=yes|no for 'all' connection types. (#528822) +- network-functions: load bonding driver if BONDING_OPTS is defined. (#516569) +- rc.sysinit: put /dev/shm in mtab too, as dracut now mounts it. (#528667) + +* Fri Oct 9 2009 Bill Nottingham - 9.01-1 +- rc.sysinit: fix handling of dmraid output to avoid error messages (#527726, ) +- rwtab: add /var/lib/xend (#526046) +- translation updates: fi, nb, pl + +* Fri Oct 2 2009 Bill Nottingham - 9.00-1 +- halt: wrap /sbin/killall5 to catch some return codes (#526539) +- netfs, netconsle, network: fix return codes to match LSB spec (#524489, #524480, #524486) +- handle kernels compiled both with and without CONFIG_RTC_HCTOSYS +- halt: use killall5's return code to avoid unncesssary sleeping (#524359, ) +- halt: don't kill mdmon on shutdown. (#524357, ) +- rc.sysinit: do not try and activate ISW raidsets, unless noiswmd is passed. (#524355, ) +- translation updates: ca, cs, da, mai, po, sv, uk + * Mon Sep 14 2009 Bill Nottingham - 8.99-1 - init.d/functions: add a '-l' option to status to pass lock file name (#521772) - tweak kernel conflict diff --git a/sources b/sources index 70c0b01..f2252b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec294a0d68f6a14c1b6f3cf507a48aad initscripts-8.99.tar.bz2 +668fa2762b57ef75436303857847bba3 initscripts-9.03.tar.bz2 From 601fdd54fc32ded4dc50f69b7b883db36a827b8f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 15 Jan 2010 20:11:31 +0000 Subject: [PATCH 014/209] 9.04-1 --- .cvsignore | 2 +- initscripts.spec | 19 ++++++++++++++++--- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a2b253..eb5c948 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.03.tar.bz2 +initscripts-9.04.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 3bedab1..aebd40e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,11 +2,11 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03 +Version: 9.04 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +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 @@ -31,7 +31,7 @@ Requires: popt >= 1.12-2 Requires: cpio Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 -Conflicts: dhclient < 3.0.3-7 +Conflicts: dhclient < 12:4.1.0-6 Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 @@ -243,6 +243,19 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Jan 15 2010 Bill Nottingham - 9.04-1 +- various shell-related cleanups and optimizations +- ifup-eth: use dhclient's -H option instead of munging dhclient config files +- rc.sysinit: move mdadm after dmraid (#494821) +- ifup-eth: use dhclient -6, not the no-longer-included dhcp6c +- add more man pages (#529328, ) +- move is_wireless after MACADDR/MTU setting (#552638) +- serial.conf: respawn correctly. (#552324, ) +- network-functions: use sysfs for wireless check (#551019, ) +- reload init on started messagebus () +- honor HOTPLUG in ifdown (#547737) +- network-functions: silence error. (#516569) + * Wed Dec 9 2009 Bill Nottingham - 9.03-1 - migrate to upstart 0.6.x (, ) -- jobs move to /etc/init diff --git a/sources b/sources index f2252b4..a2df53b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -668fa2762b57ef75436303857847bba3 initscripts-9.03.tar.bz2 +83bc133219f626bd652ca88c82df5476 initscripts-9.04.tar.bz2 From e5f4aa94b8a7adaf85f474a45fc68059346d8b64 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Feb 2010 17:25:46 +0000 Subject: [PATCH 015/209] 9.05-1 --- .cvsignore | 2 +- initscripts.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb5c948..7618acb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.04.tar.bz2 +initscripts-9.05.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index aebd40e..ee4b6fa 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.04 +Version: 9.05 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -243,6 +243,18 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Feb 15 2010 Bill Nottingham - 9.05-1 +- network-functions: don't use ethtool for link state, assorted other cleanups +- inittab: fix job paths in comments () +- init.d/functions: don't clear environment in runuser (#203010, #564093) +- 88-clock.rules: use ATTR, not SYSFS (#560756) +- init.d/network: don't quote regex argument to bash's =~ () +- network-functions: use HWADDR to determine DEVICE if DEVICE isn't set (#545597) +- don't HUP init when messagebus starts (#557791) +- setsysfont: use UNIMAP, not SYSFONTACM, when calling unicode_start (#557089) +- ifup: don't leave the link down on link failure for DHCP (#462013, #491009) +- translation updates: cs + * Fri Jan 15 2010 Bill Nottingham - 9.04-1 - various shell-related cleanups and optimizations - ifup-eth: use dhclient's -H option instead of munging dhclient config files diff --git a/sources b/sources index a2df53b..4a18de3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83bc133219f626bd652ca88c82df5476 initscripts-9.04.tar.bz2 +58ff8a7a09537155cbaf09b3a8e7b25f initscripts-9.05.tar.bz2 From d76b34a7d4c203733ac651a3cb26e5c788c422dd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Feb 2010 17:34:12 +0000 Subject: [PATCH 016/209] Fix link check. --- initscripts-9.05-link.patch | 13 +++++++++++++ initscripts.spec | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 initscripts-9.05-link.patch diff --git a/initscripts-9.05-link.patch b/initscripts-9.05-link.patch new file mode 100644 index 0000000..e9855d4 --- /dev/null +++ b/initscripts-9.05-link.patch @@ -0,0 +1,13 @@ +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 02a024a..89baeb4 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -253,7 +253,7 @@ check_link_down () + delay=10 + [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) + while [ $timeout -le $delay ]; do +- [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" = "1" ] && return 1 ++ [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1 + usleep 500000 + timeout=$((timeout+1)) + done diff --git a/initscripts.spec b/initscripts.spec index ee4b6fa..57de21d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,9 +6,10 @@ Version: 9.05 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist} +Release: 1%{?dist}.1 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 +Patch: initscripts-9.05-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -63,6 +64,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch -p1 %build make From e17ead2f6b1f18a5a256701b15169154cbf894b0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 19 Feb 2010 21:45:23 +0000 Subject: [PATCH 017/209] 9.06-1 --- .cvsignore | 2 +- initscripts-9.05-link.patch | 13 ------------- initscripts.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 initscripts-9.05-link.patch diff --git a/.cvsignore b/.cvsignore index 7618acb..c28583a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.05.tar.bz2 +initscripts-9.06.tar.bz2 diff --git a/initscripts-9.05-link.patch b/initscripts-9.05-link.patch deleted file mode 100644 index e9855d4..0000000 --- a/initscripts-9.05-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 02a024a..89baeb4 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -253,7 +253,7 @@ check_link_down () - delay=10 - [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) - while [ $timeout -le $delay ]; do -- [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" = "1" ] && return 1 -+ [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1 - usleep 500000 - timeout=$((timeout+1)) - done diff --git a/initscripts.spec b/initscripts.spec index 57de21d..bb15c0c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,14 +2,13 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.05 +Version: 9.06 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch: initscripts-9.05-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -37,6 +36,7 @@ Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 +Conflicts: s390utils < 2:1.8.2-11 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Obsoletes: hotplug @@ -64,7 +64,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch -p1 %build make @@ -86,8 +85,6 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ - $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ - $RPM_BUILD_ROOT/lib/udev/ccw_init %else rm -f \ $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \ @@ -214,9 +211,6 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rename_device /lib/udev/console_init /lib/udev/console_check -%ifarch s390 s390x -/lib/udev/ccw_init -%endif /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -245,6 +239,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Feb 19 2010 Bill Nottingham - 9.06-1 +- move ccw_init and ccw udev rules to s390utils (#539491) +- rc.sysinit: suppress LVM2 warnings. (#561938, ) +- fix translated checks for user input (#566579) +- refresh translations + * Mon Feb 15 2010 Bill Nottingham - 9.05-1 - network-functions: don't use ethtool for link state, assorted other cleanups - inittab: fix job paths in comments () diff --git a/sources b/sources index 4a18de3..d174f15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58ff8a7a09537155cbaf09b3a8e7b25f initscripts-9.05.tar.bz2 +0e1ee1b1b77eb77c44b382e5b3e6d98c initscripts-9.06.tar.bz2 From bf04cfcdc22bbaa0d32fb952cde5e60a69981075 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 3 Mar 2010 21:36:54 +0000 Subject: [PATCH 018/209] 9.07-1 --- .cvsignore | 2 +- initscripts.spec | 26 +++++++++++++++++--------- sources | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index c28583a..617ac87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.06.tar.bz2 +initscripts-9.07.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index bb15c0c..25e9b68 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.06 +Version: 9.07 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -10,12 +10,12 @@ 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 -Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 -Requires: /sbin/sysctl, syslog +Requires: mingetty, /bin/awk, /bin/sed, mktemp +Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools -Requires: util-linux-ng >= 2.16, mount >= 2.11l +Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87 %if with_upstart @@ -24,10 +24,9 @@ Requires: upstart >= 0.6.0 Requires: SysVinit >= 2.85-38 %endif Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find -Requires: /etc/redhat-release, dev -Requires: ethtool >= 1.8-2, /sbin/runuser +Requires: /etc/redhat-release +Requires: /sbin/runuser Requires: udev >= 125-1 -Requires: popt >= 1.12-2 Requires: cpio Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 @@ -37,9 +36,12 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 Conflicts: s390utils < 2:1.8.2-11 +Conflicts: dmraid < 1.0.0.rc16-7 +Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Obsoletes: hotplug +Conflicts: NetworkManager < 1:0.8.0 +Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig @@ -239,6 +241,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Mar 3 2010 Bill Nottingham - 9.07-1 +- clean out some extraneous package requirements +- fix dmraid error checking now that dmraid has return codes (#568790, others) +- integrate with NetworkManager for ifup/ifdown (#523064) +- translation updates: cs, da, de, en_GB, es, fi, nl, pl, pt_BR, ru, sr + * Fri Feb 19 2010 Bill Nottingham - 9.06-1 - move ccw_init and ccw udev rules to s390utils (#539491) - rc.sysinit: suppress LVM2 warnings. (#561938, ) @@ -415,7 +423,7 @@ rm -rf $RPM_BUILD_ROOT - event.d/serial: add some docs - init.d/functions: __pids_var_run: Handle multi-line pid files correctly (#473287) - remove support for no longer existing 'brctl setgcint' command. (#360471) -- add %config back for ifcfg-lo (#472761) +- add %%config back for ifcfg-lo (#472761) - rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717) - updated translations: de, sk diff --git a/sources b/sources index d174f15..63c72fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e1ee1b1b77eb77c44b382e5b3e6d98c initscripts-9.06.tar.bz2 +cb912c5be515a10d09685f8877d2beae initscripts-9.07.tar.bz2 From 72017b0e0b3cddf3a1890236a0659948958d4d63 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 8 Mar 2010 20:51:35 +0000 Subject: [PATCH 019/209] 9.08 --- .cvsignore | 2 +- initscripts.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 617ac87..41557da 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.07.tar.bz2 +initscripts-9.08.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 25e9b68..cce1be7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.07 +Version: 9.08 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Mar 8 2010 Bill Nottingham - 9.08-1 +- network-functions: redirect error messages when nmcli isn't installed (#570828, ) +- ifdown: use nmcli to get the device, if not specified +- ifdown: fix typo +- translation updates: fr + * Wed Mar 3 2010 Bill Nottingham - 9.07-1 - clean out some extraneous package requirements - fix dmraid error checking now that dmraid has return codes (#568790, others) diff --git a/sources b/sources index 63c72fc..1f4a7fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb912c5be515a10d09685f8877d2beae initscripts-9.07.tar.bz2 +0808ca2d5f0b7b883ad499cdc35a83e4 initscripts-9.08.tar.bz2 From a3425c1793d6dcfb578870d4d9ca56fe65b5b483 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Apr 2010 19:53:31 +0000 Subject: [PATCH 020/209] 9.09-1 --- .cvsignore | 2 +- initscripts.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 41557da..6c0d549 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.08.tar.bz2 +initscripts-9.09.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index cce1be7..0443e9a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.08 +Version: 9.09 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,7 +28,7 @@ Requires: /etc/redhat-release Requires: /sbin/runuser Requires: udev >= 125-1 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 +Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 12:4.1.0-6 Conflicts: tcsh < 6.13-5 @@ -241,6 +241,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Apr 9 2010 Bill Nottingham - 9.09-1 +- rc.sysinit: change RAID handling () +- fix german mistranslation (#575954, ) +- init.d/functions: correct fix for environment with runuser. (#203010, #564093) +- halt: fix mdmom pid handling for newer mdadm (#549726, ) +- init.d/network: only blacklist the original loopback interface. (#579816, +- translation updates: de, ja, nb, pt, sv, uk + * Mon Mar 8 2010 Bill Nottingham - 9.08-1 - network-functions: redirect error messages when nmcli isn't installed (#570828, ) - ifdown: use nmcli to get the device, if not specified diff --git a/sources b/sources index 1f4a7fe..f47cbea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0808ca2d5f0b7b883ad499cdc35a83e4 initscripts-9.08.tar.bz2 +980df0c574b6dc6367c2fecd867c055d initscripts-9.09.tar.bz2 From c3b54fcaf57bf31687dab793437429175d6527cb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 30 Apr 2010 20:15:36 +0000 Subject: [PATCH 021/209] sync --- .cvsignore | 2 +- initscripts.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6c0d549..2c4e6f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.09.tar.bz2 +initscripts-9.10.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 0443e9a..ae8b43b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.09 +Version: 9.10 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Apr 28 2010 Bill Nottingham - 9.10-1 +- fstab-decode.8: fix formatting (#586476) +- prefdm: add --retain-splash for KDM as well (#585250) +- init.d/functions: handle being unable to read a specified pid file. (#584575) +- init/quit-plymouth.conf: use 'task' for stopping plymouth. () +- ifup-eth: run dhclient -6 similar to dhclient -4. (#585047) +- net.hotplug: don't run on odd interfaces. (#584530) + * Fri Apr 9 2010 Bill Nottingham - 9.09-1 - rc.sysinit: change RAID handling () - fix german mistranslation (#575954, ) diff --git a/sources b/sources index f47cbea..297ba4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -980df0c574b6dc6367c2fecd867c055d initscripts-9.09.tar.bz2 +b3f242aaf8b45d35028dc3e89af1f898 initscripts-9.10.tar.bz2 From 06c911f758292fb4202142cbf8ef96e5fdf40ca6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 3 May 2010 19:06:57 +0000 Subject: [PATCH 022/209] 9.11-1 --- .cvsignore | 2 +- initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c4e6f4..7a413e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.10.tar.bz2 +initscripts-9.11.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index ae8b43b..9a30519 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.10 +Version: 9.11 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon May 3 2010 Bill Nottingham - 9.11-1 +- init/plymouth-shutdown.conf: add 'task' here as well + * Wed Apr 28 2010 Bill Nottingham - 9.10-1 - fstab-decode.8: fix formatting (#586476) - prefdm: add --retain-splash for KDM as well (#585250) diff --git a/sources b/sources index 297ba4a..e24acfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3f242aaf8b45d35028dc3e89af1f898 initscripts-9.10.tar.bz2 +b576406455fa87bf5d329bd161df4b09 initscripts-9.11.tar.bz2 From c7ac7724e3f253a27fb0c709c881ab744623e8eb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 5 May 2010 16:24:28 +0000 Subject: [PATCH 023/209] 9.13-1 --- .cvsignore | 2 +- initscripts.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a413e7..712570b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.11.tar.bz2 +initscripts-9.12.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9a30519..d7582c2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.11 +Version: 9.12 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -40,7 +40,7 @@ Conflicts: dmraid < 1.0.0.rc16-7 Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Conflicts: NetworkManager < 1:0.8.0 +Conflicts: NetworkManager < 1:0.8.0-12.git20100504 Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils @@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed May 5 2010 Bill Nottingham - 9.12-1 +- update for final nmcli syntax + * Mon May 3 2010 Bill Nottingham - 9.11-1 - init/plymouth-shutdown.conf: add 'task' here as well diff --git a/sources b/sources index e24acfc..d74f2c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b576406455fa87bf5d329bd161df4b09 initscripts-9.11.tar.bz2 +c73218ac6ae1e5ea3a24bd10669e8a61 initscripts-9.12.tar.bz2 From 5b38bfce47231ea63e8e854c3cc0a8e9ef7b1e2d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 19 May 2010 17:13:20 +0000 Subject: [PATCH 024/209] 9.13-1 --- .cvsignore | 2 +- initscripts.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 712570b..264055e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.12.tar.bz2 +initscripts-9.13.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d7582c2..8ddd22b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.12 +Version: 9.13 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -36,7 +36,7 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 Conflicts: s390utils < 2:1.8.2-11 -Conflicts: dmraid < 1.0.0.rc16-7 +Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.65 Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 @@ -241,6 +241,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed May 19 2010 Bill Nottingham - 9.13-1 +- clean up plymouth shtudown splash (#590099, ) +- rc.sysinit: use lvm2 --sysinit option (#588777) +- network-functions: behave sanely in the absence of $DEVICE (#589521) +- sysconfig/debug: export debug variables (#589378) +- netfs: check for NM to be connected, not just running (#589710) +- rcS*.conf: check if /etc/inittab exists (#590703, ) +- port vlan code to /sbin/ip (#566485, ) + * Wed May 5 2010 Bill Nottingham - 9.12-1 - update for final nmcli syntax diff --git a/sources b/sources index d74f2c0..5818f93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c73218ac6ae1e5ea3a24bd10669e8a61 initscripts-9.12.tar.bz2 +c70cfdc77a6a4016b690feeab95adbdd initscripts-9.13.tar.bz2 From 96f9c88953c9ebd74353add0fdfad2543cf137df Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 19 May 2010 18:09:57 +0000 Subject: [PATCH 025/209] 9.14-1 --- .cvsignore | 2 +- initscripts.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 264055e..931e6f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.13.tar.bz2 +initscripts-9.14.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 8ddd22b..c9f1b3f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.13 +Version: 9.14 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,7 +241,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed May 19 2010 Bill Nottingham - 9.13-1 +* Wed May 19 2010 Bill Nottingham - 9.14-1 - clean up plymouth shtudown splash (#590099, ) - rc.sysinit: use lvm2 --sysinit option (#588777) - network-functions: behave sanely in the absence of $DEVICE (#589521) diff --git a/sources b/sources index 5818f93..58a2b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c70cfdc77a6a4016b690feeab95adbdd initscripts-9.13.tar.bz2 +61aedd729b264946290211ae2c6fae3c initscripts-9.14.tar.bz2 From 17f59668df4eb322995a0863f924d9437760d05c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Jun 2010 19:07:13 +0000 Subject: [PATCH 026/209] 9.15-1 --- .cvsignore | 2 +- initscripts.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 931e6f1..b83a15b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.14.tar.bz2 +initscripts-9.15.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index c9f1b3f..6065084 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.14 +Version: 9.15 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -24,7 +24,7 @@ Requires: upstart >= 0.6.0 Requires: SysVinit >= 2.85-38 %endif Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find -Requires: /etc/redhat-release +Requires: /etc/system-release Requires: /sbin/runuser Requires: udev >= 125-1 Requires: cpio @@ -241,6 +241,17 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Jun 24 2010 Bill Nottingham - 9.15-1 +- ifup-eth: check for dhclient configuration in /etc/dhcp as well (#607764, #607766) +- network-functions: handle quoted SUBCHANNELS (#607481) +- netfs: allow for encrypted network block devices (#605600) +- ifdown-ipsec: don't use a full path when killing racoon, so it works in MLS policy (#567295) +- network-functions: check NM_CONTROLLED before deciding to use NM for a connection. (#599707, probably others.) +- rc.sysinit: always reboot on autorelabel. (#595823) +- init.d/functions: handle permission denied on reading PID file. (#595597) +- clean up some deprecated items +- translation updates: el, nl, or, zh_CN + * Wed May 19 2010 Bill Nottingham - 9.14-1 - clean up plymouth shtudown splash (#590099, ) - rc.sysinit: use lvm2 --sysinit option (#588777) diff --git a/sources b/sources index 58a2b13..768819e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61aedd729b264946290211ae2c6fae3c initscripts-9.14.tar.bz2 +81ec34f2df822a1ef2755d946fd419ee initscripts-9.15.tar.bz2 From 9645e571475a1e1e6474a96c45da6eab005e562e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 27 Jul 2010 18:14:49 +0000 Subject: [PATCH 027/209] 9.16-1 --- .cvsignore | 2 +- initscripts.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b83a15b..2053cd1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.15.tar.bz2 +initscripts-9.16.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 6065084..19d5ba0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.15 +Version: 9.16 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -208,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/genhostid /sbin/getkey /sbin/securetty +/sbin/sushell %attr(2755,root,root) /sbin/netreport /lib/udev/rules.d/* /lib/udev/rename_device @@ -241,6 +242,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Jul 27 2010 Bill Nottingham - 9.16-1 +- halt: don't umount cgroups (#612789) +- rename_device: dequote DEVICE key, handle SUBCHANNELS () +- sysconfig.txt: document PREFIX/NETMASK (#617481, ) +- sysconfig.txt: document NETWORKWAIT (#595386) +- remove support for hotkey interactive startup (#605016). Use 'confirm' on the commandline + (but even that doesn't fully make sense in an upstart/systemd world) +- don't directly execute bash for single-user mode (#540216, #584443, #585053) + * Thu Jun 24 2010 Bill Nottingham - 9.15-1 - ifup-eth: check for dhclient configuration in /etc/dhcp as well (#607764, #607766) - network-functions: handle quoted SUBCHANNELS (#607481) diff --git a/sources b/sources index 768819e..7cdb6b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81ec34f2df822a1ef2755d946fd419ee initscripts-9.15.tar.bz2 +209304d2eab7dd5a35f99ae53162dccf initscripts-9.16.tar.bz2 From b6d0762f19b18d91769b893168abd5719d239295 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:17:44 +0000 Subject: [PATCH 028/209] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6152ae2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: initscripts -# $Id$ -NAME := initscripts -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d752353778707624e5f116b6cd41901aed7e8ce9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:18:05 +0000 Subject: [PATCH 029/209] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6152ae2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: initscripts -# $Id$ -NAME := initscripts -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 From a6eab64ca083d25d7eeabd799dd998f836c85a13 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 29 Jul 2010 17:22:45 -0400 Subject: [PATCH 030/209] test --- initscripts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/initscripts.spec b/initscripts.spec index 19d5ba0..296538d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,3 +1,4 @@ + %define with_upstart 1%{nil} Summary: The inittab file and the /etc/init.d scripts From 32d297a0a28c9ab08c3784b74d687f2be13a4c2b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 9 Aug 2010 09:53:49 -0700 Subject: [PATCH 031/209] * Mon Aug 09 2010 Adam Williamson - 9.16-2 - return exit code 0 after killall (upstream commits 677fbac75b7517a4e20a65d555e3d33c37af79a4 and ce28b8c214c0b4eb7bb35dda38ae5f451b7c1c56) --- initscripts-9.16-killall_exitcode.patch | 22 ++++++++++++++++++++++ initscripts.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 initscripts-9.16-killall_exitcode.patch diff --git a/initscripts-9.16-killall_exitcode.patch b/initscripts-9.16-killall_exitcode.patch new file mode 100644 index 0000000..d649908 --- /dev/null +++ b/initscripts-9.16-killall_exitcode.patch @@ -0,0 +1,22 @@ +From 677fbac75b7517a4e20a65d555e3d33c37af79a4 Mon Sep 17 00:00:00 2001 +From: Bill Nottingham +Date: Mon, 2 Aug 2010 12:43:38 -0400 +Subject: [PATCH] exit with a zero return code. (#605519) + +--- + rc.d/init.d/killall | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/rc.d/init.d/killall b/rc.d/init.d/killall +index c1169b1..e4e08bd 100755 +--- a/rc.d/init.d/killall ++++ b/rc.d/init.d/killall +@@ -32,3 +32,4 @@ for i in /var/lock/subsys/* ; do + rm -f "$i" + fi + done ++exit 0 +-- +1.5.5.6 + + diff --git a/initscripts.spec b/initscripts.spec index 296538d..022d8e9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -7,9 +7,10 @@ Version: 9.16 # 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 +Patch0: initscripts-9.16-killall_exitcode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -67,6 +68,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 -b .exitcode %build make @@ -243,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Aug 09 2010 Adam Williamson - 9.16-2 +- return exit code 0 after killall (upstream commits 677fbac75b7517a4e20a65d555e3d33c37af79a4 and ce28b8c214c0b4eb7bb35dda38ae5f451b7c1c56) + * Tue Jul 27 2010 Bill Nottingham - 9.16-1 - halt: don't umount cgroups (#612789) - rename_device: dequote DEVICE key, handle SUBCHANNELS () From b70b64e4e4c75c2dba01757705bfec363db94e36 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Aug 2010 16:15:16 -0400 Subject: [PATCH 032/209] 9.17-1 --- .gitignore | 1 + initscripts.spec | 17 ++++++++++------- sources | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2053cd1..93f3fb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ initscripts-9.16.tar.bz2 +/initscripts-9.17.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 022d8e9..9e8fd38 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,16 +1,14 @@ - %define with_upstart 1%{nil} Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.16 +Version: 9.17 # 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 -Patch0: initscripts-9.16-killall_exitcode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -68,7 +66,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 -b .exitcode %build make @@ -245,8 +242,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Aug 09 2010 Adam Williamson - 9.16-2 -- return exit code 0 after killall (upstream commits 677fbac75b7517a4e20a65d555e3d33c37af79a4 and ce28b8c214c0b4eb7bb35dda38ae5f451b7c1c56) +* Wed Aug 25 2010 Bill Nottingham - 9.17-1 +- init.d/functions: redirect start/stop/condrestart/etc to systemctl in a systemd environment (#612728) +- rc.sysinit: don't frob the console loglevel on boot (#621257, #626572) +- service: use systemctl on systemd services +- 10-console.rules: only init consoles on add, not change () +- halt: fix unmounting bind mounts (#620461, ) +- killall: exit 0 (#605519) +- translation updates: de, es, fi, fr, nl, pl, sv, uk * Tue Jul 27 2010 Bill Nottingham - 9.16-1 - halt: don't umount cgroups (#612789) diff --git a/sources b/sources index 7cdb6b9..dbbbcc9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 209304d2eab7dd5a35f99ae53162dccf initscripts-9.16.tar.bz2 +3f4f0ad98657a05a7f272bc015d5205f initscripts-9.17.tar.bz2 From 98e69fe5400f703785bd8bb9e4d5279a2d97fcd9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Aug 2010 13:27:42 -0400 Subject: [PATCH 033/209] Fix umount on halt --- cgroup.diff | 28 ++++++++++++++++++++++++++++ initscripts.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 cgroup.diff diff --git a/cgroup.diff b/cgroup.diff new file mode 100644 index 0000000..4ccbead --- /dev/null +++ b/cgroup.diff @@ -0,0 +1,28 @@ +commit af1d17f1d3e213e41d9b320b5e2251118d463bd3 +Author: Bill Nottingham +Date: Thu Aug 26 13:25:36 2010 -0400 + + Fix umount on halt for new cgroup location. (#612789) + +diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt +index a19c76f..cb33cbe 100755 +--- a/rc.d/init.d/halt ++++ b/rc.d/init.d/halt +@@ -138,7 +138,7 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \ + $"Unmounting pipe file systems (retry): " \ + -f + +-LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/dev/{next} ++LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/sys\/fs\/cgroup|^\/dev/{next} + $3 == "tmpfs" || $3 == "proc" {print $2 ; next} + /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next} + {print $2}' /proc/mounts \ +@@ -155,7 +155,7 @@ rm -f /.autofsck + + # Try all file systems other than root, essential filesystems and RAM disks, + # one last time. +-awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \ ++awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /(^\/dev\/ram|cgroup)/ { print $2 }' \ + /proc/mounts | sort -r | \ + while read line; do + fstab-decode $UMOUNT -f $line diff --git a/initscripts.spec b/initscripts.spec index 9e8fd38..d27d09f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,7 +6,7 @@ Version: 9.17 # 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 @@ -46,6 +46,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: cgroup.diff %description The initscripts package contains the basic system scripts used to boot @@ -66,6 +67,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 %build make @@ -242,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Aug 26 2010 Bill Nottingham - 9.17-2 +- halt: fix umount on halt for new cgroup location. (#612789) + * Wed Aug 25 2010 Bill Nottingham - 9.17-1 - init.d/functions: redirect start/stop/condrestart/etc to systemctl in a systemd environment (#612728) - rc.sysinit: don't frob the console loglevel on boot (#621257, #626572) From 0970c63e3d9f59e0017de15ccc667dc25ce6b77b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 3 Sep 2010 17:38:24 -0400 Subject: [PATCH 034/209] 9.18-1 --- .gitignore | 1 + initscripts.spec | 60 +++++++++++++++++++++++++++++++++++++----------- sources | 3 +-- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 93f3fb2..d93fb79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ initscripts-9.16.tar.bz2 /initscripts-9.17.tar.bz2 +/initscripts-9.18.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d27d09f..ede235e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,12 +1,14 @@ -%define with_upstart 1%{nil} +%define _with_upstart 1 +%define _with_systemd 1 +%define _with_sysvinit 0 Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.17 +Version: 9.18 # 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 @@ -18,9 +20,15 @@ Requires: module-init-tools Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87 -%if with_upstart -Requires: upstart >= 0.6.0 -%else +Requires: sysvinit-userspace +%if %{_with_upstart} +Conflicts: upstart < 0.6.0 +%endif +%if %{_with_systemd} +Conflicts: systemd < 9-3 +Conflicts: systemd-units < 9-3 +%endif +%if %{_with_sysvinit} Requires: SysVinit >= 2.85-38 %endif Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find @@ -46,7 +54,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: cgroup.diff %description The initscripts package contains the basic system scripts used to boot @@ -67,7 +74,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 %build make @@ -78,12 +84,21 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %find_lang %{name} -%if with_upstart +%if %{_with_systemd} + mv -f $RPM_BUILD_ROOT/etc/inittab.systemd $RPM_BUILD_ROOT/etc/inittab +%endif +%if %{_with_upstart} mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab -%else +%endif +%if %{_with_sysvinit} mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab +%endif +%if ! %{_with_upstart} rm -rf $RPM_BUILD_ROOT/etc/init %endif +%if ! %{_with_systemd} + rm -rf $RPM_BUILD_ROOT/etc/systemd $RPM_BUILD_ROOT/lib/systemd +%endif rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x @@ -107,6 +122,11 @@ chmod 600 /var/log/btmp /sbin/chkconfig --add netfs /sbin/chkconfig --add network /sbin/chkconfig --add netconsole +%if %{_with_systemd} +if [ $1 -eq 1 ]; then + /bin/systemctl daemon-reload > /dev/null 2>&1 || : +fi +%endif %preun if [ $1 = 0 ]; then @@ -120,6 +140,14 @@ fi /sbin/chkconfig --del rawdevices exit 0 +%if %{_with_systemd} +%postun +if [ $1 -ge 1 ]; then + /bin/systemctl daemon-reload > /dev/null 2>&1 || : +fi +%endif + + %clean rm -rf $RPM_BUILD_ROOT @@ -180,9 +208,13 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rwtab.d /etc/statetab %dir /etc/statetab.d -%if with_upstart +%if %{_with_upstart} /etc/init/* %endif +%if %{_with_systemd} +%config(noreplace) /etc/systemd/system/* +/lib/systemd/system/* +%endif %config /etc/X11/prefdm %config(noreplace) /etc/inittab %dir /etc/rc.d @@ -244,8 +276,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Aug 26 2010 Bill Nottingham - 9.17-2 -- halt: fix umount on halt for new cgroup location. (#612789) +* Fri Sep 3 2010 Bill Nottingham - 9.18-1 +- fix for new cgroups location (#612789, others ) +- add in basic systemd units +- translation updates: nb, pt, sv * Wed Aug 25 2010 Bill Nottingham - 9.17-1 - init.d/functions: redirect start/stop/condrestart/etc to systemctl in a systemd environment (#612728) diff --git a/sources b/sources index dbbbcc9..6922fa1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -209304d2eab7dd5a35f99ae53162dccf initscripts-9.16.tar.bz2 -3f4f0ad98657a05a7f272bc015d5205f initscripts-9.17.tar.bz2 +1383f0341df08d77c60b496769e305fe initscripts-9.18.tar.bz2 From c628fe89be718752da972a078058bba708bca1ab Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 3 Sep 2010 17:39:19 -0400 Subject: [PATCH 035/209] Delete extraneous stuff. --- cgroup.diff | 28 ------------------------- initscripts-9.16-killall_exitcode.patch | 22 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 cgroup.diff delete mode 100644 initscripts-9.16-killall_exitcode.patch diff --git a/cgroup.diff b/cgroup.diff deleted file mode 100644 index 4ccbead..0000000 --- a/cgroup.diff +++ /dev/null @@ -1,28 +0,0 @@ -commit af1d17f1d3e213e41d9b320b5e2251118d463bd3 -Author: Bill Nottingham -Date: Thu Aug 26 13:25:36 2010 -0400 - - Fix umount on halt for new cgroup location. (#612789) - -diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt -index a19c76f..cb33cbe 100755 ---- a/rc.d/init.d/halt -+++ b/rc.d/init.d/halt -@@ -138,7 +138,7 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \ - $"Unmounting pipe file systems (retry): " \ - -f - --LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/dev/{next} -+LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/sys\/fs\/cgroup|^\/dev/{next} - $3 == "tmpfs" || $3 == "proc" {print $2 ; next} - /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next} - {print $2}' /proc/mounts \ -@@ -155,7 +155,7 @@ rm -f /.autofsck - - # Try all file systems other than root, essential filesystems and RAM disks, - # one last time. --awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \ -+awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /(^\/dev\/ram|cgroup)/ { print $2 }' \ - /proc/mounts | sort -r | \ - while read line; do - fstab-decode $UMOUNT -f $line diff --git a/initscripts-9.16-killall_exitcode.patch b/initscripts-9.16-killall_exitcode.patch deleted file mode 100644 index d649908..0000000 --- a/initscripts-9.16-killall_exitcode.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 677fbac75b7517a4e20a65d555e3d33c37af79a4 Mon Sep 17 00:00:00 2001 -From: Bill Nottingham -Date: Mon, 2 Aug 2010 12:43:38 -0400 -Subject: [PATCH] exit with a zero return code. (#605519) - ---- - rc.d/init.d/killall | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/rc.d/init.d/killall b/rc.d/init.d/killall -index c1169b1..e4e08bd 100755 ---- a/rc.d/init.d/killall -+++ b/rc.d/init.d/killall -@@ -32,3 +32,4 @@ for i in /var/lock/subsys/* ; do - rm -f "$i" - fi - done -+exit 0 --- -1.5.5.6 - - From 9bb7ed38764d2b458f854c88536ffa2b1a13268b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 7 Sep 2010 15:32:49 -0400 Subject: [PATCH 036/209] 9.19-1 --- .gitignore | 1 + initscripts.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d93fb79..13addfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ initscripts-9.16.tar.bz2 /initscripts-9.17.tar.bz2 /initscripts-9.18.tar.bz2 +/initscripts-9.19.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index ede235e..7910a0a 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.18 +Version: 9.19 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -97,7 +97,7 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi rm -rf $RPM_BUILD_ROOT/etc/init %endif %if ! %{_with_systemd} - rm -rf $RPM_BUILD_ROOT/etc/systemd $RPM_BUILD_ROOT/lib/systemd + rm -rf $RPM_BUILD_ROOT/lib/systemd %endif rm -f $RPM_BUILD_ROOT/etc/inittab.* @@ -212,7 +212,6 @@ rm -rf $RPM_BUILD_ROOT /etc/init/* %endif %if %{_with_systemd} -%config(noreplace) /etc/systemd/system/* /lib/systemd/system/* %endif %config /etc/X11/prefdm @@ -276,6 +275,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Sep 7 2010 Bill Nottingham - 9.19-1 +- fix packaging of prefdm, rc-local systemd units (#630952) +- systemd/single.service: conflict with shutdown.target (#630935) +- translation updates: ja, pt_BR, ru + * Fri Sep 3 2010 Bill Nottingham - 9.18-1 - fix for new cgroups location (#612789, others ) - add in basic systemd units diff --git a/sources b/sources index 6922fa1..a5662c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1383f0341df08d77c60b496769e305fe initscripts-9.18.tar.bz2 +35bba02e1a736bb1425271f4d5dbd078 initscripts-9.19.tar.bz2 From 6a8f8c8460da870304c3934d53755788eb0feec5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 9 Sep 2010 17:40:03 -0400 Subject: [PATCH 037/209] 9.20-1 --- .gitignore | 1 + initscripts.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13addfe..37f0830 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ initscripts-9.16.tar.bz2 /initscripts-9.17.tar.bz2 /initscripts-9.18.tar.bz2 /initscripts-9.19.tar.bz2 +/initscripts-9.20.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 7910a0a..70315b1 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.19 +Version: 9.20 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -19,7 +19,7 @@ Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 -Requires: sysvinit-tools >= 2.87 +Requires: sysvinit-tools >= 2.87-5 Requires: sysvinit-userspace %if %{_with_upstart} Conflicts: upstart < 0.6.0 @@ -275,6 +275,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Sep 9 2010 Bill Nottingham - 9.20-1 +- use new pidof -m option to avoid false positives (#632321) +- systemd/single: set $HOME for single-user mode. (#631590) +- systemd/killal.service: require shutdown.target (#630935, #632198) + * Tue Sep 7 2010 Bill Nottingham - 9.19-1 - fix packaging of prefdm, rc-local systemd units (#630952) - systemd/single.service: conflict with shutdown.target (#630935) diff --git a/sources b/sources index a5662c8..060eb04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -35bba02e1a736bb1425271f4d5dbd078 initscripts-9.19.tar.bz2 +bf2b07f0f83e00ca3ed08cbb47f033c2 initscripts-9.20.tar.bz2 From b012c93a5b8d67f32b69d7079b27c57702306e0c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 17 Sep 2010 14:08:50 -0400 Subject: [PATCH 038/209] 9.21-1 --- .gitignore | 1 + initscripts.spec | 16 ++++++++++++++-- sources | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 37f0830..47e54b1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ initscripts-9.16.tar.bz2 /initscripts-9.18.tar.bz2 /initscripts-9.19.tar.bz2 /initscripts-9.20.tar.bz2 +/initscripts-9.21.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 70315b1..dc5affc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,10 +1,10 @@ -%define _with_upstart 1 +%define _with_upstart 0 %define _with_systemd 1 %define _with_sysvinit 0 Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.20 +Version: 9.21 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -23,10 +23,16 @@ Requires: sysvinit-tools >= 2.87-5 Requires: sysvinit-userspace %if %{_with_upstart} Conflicts: upstart < 0.6.0 +%if ! %{_with_systemd} +Requires: upstart-sysvinit +%endif %endif %if %{_with_systemd} Conflicts: systemd < 9-3 Conflicts: systemd-units < 9-3 +%if ! %{_with_upstart} +Requires: systemd-sysvinit +%endif %endif %if %{_with_sysvinit} Requires: SysVinit >= 2.85-38 @@ -275,6 +281,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Seo 17 2010 Bill Nottingham - 9.21-1 +- build for systemd only +- ship a default.target link in case the one in /etc gets deleted +- rc.sysinit: reset btmp on boot if necessary (#633768, ) +- single.service: fix invocation so that 'runlevel' works (#630914) + * Thu Sep 9 2010 Bill Nottingham - 9.20-1 - use new pidof -m option to avoid false positives (#632321) - systemd/single: set $HOME for single-user mode. (#631590) diff --git a/sources b/sources index 060eb04..700e647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf2b07f0f83e00ca3ed08cbb47f033c2 initscripts-9.20.tar.bz2 +8cf6803cff6c1b5875acb00aeaf7620e initscripts-9.21.tar.bz2 From 7caf2bf20df6d003713729da380041346acb4d10 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 17 Sep 2010 14:09:57 -0400 Subject: [PATCH 039/209] typo --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index dc5affc..7560330 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -281,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Fri Seo 17 2010 Bill Nottingham - 9.21-1 +* Fri Sep 17 2010 Bill Nottingham - 9.21-1 - build for systemd only - ship a default.target link in case the one in /etc gets deleted - rc.sysinit: reset btmp on boot if necessary (#633768, ) From d629c4ab27b7d11fc8fb702942e5b2d60d02e4a3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 17 Sep 2010 17:14:17 -0400 Subject: [PATCH 040/209] Haaack --- initscripts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 7560330..256015d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.21 # 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 @@ -20,7 +20,7 @@ Requires: module-init-tools Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87-5 -Requires: sysvinit-userspace +#Requires: sysvinit-userspace %if %{_with_upstart} Conflicts: upstart < 0.6.0 %if ! %{_with_systemd} From c47fcd4ae2b679ac9f4b9c1f2496a9c2abfd544b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 14:29:18 -0700 Subject: [PATCH 041/209] - Rebuilt for gcc bug 634757 --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 256015d..b0c23fd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.21 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -281,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Sep 29 2010 jkeating - 9.21-3 +- Rebuilt for gcc bug 634757 + * Fri Sep 17 2010 Bill Nottingham - 9.21-1 - build for systemd only - ship a default.target link in case the one in /etc gets deleted From 137e05c789d7bc20fa03715dedfd23722e0db37b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 7 Oct 2010 11:21:56 -0400 Subject: [PATCH 042/209] remove default.target --- initscripts.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index b0c23fd..30ab210 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.21 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -116,6 +116,8 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif +rm -f /lib/systemd/system/default.target + %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -281,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Oct 7 2010 Bill Nottingham - 9.21-4 +- nuke default.target (conflcit with systemd) + * Wed Sep 29 2010 jkeating - 9.21-3 - Rebuilt for gcc bug 634757 From dfd7e3a3bd291b4c8568981c5acbb37a08e03570 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 7 Oct 2010 11:53:31 -0400 Subject: [PATCH 043/209] Doh. --- initscripts.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 30ab210..40f84a6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.21 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -116,7 +116,7 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif -rm -f /lib/systemd/system/default.target +rm -f $RPM_BUILD_ROOT/lib/systemd/system/default.target %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -283,7 +283,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Oct 7 2010 Bill Nottingham - 9.21-4 +* Thu Oct 7 2010 Bill Nottingham - 9.21-5 - nuke default.target (conflcit with systemd) * Wed Sep 29 2010 jkeating - 9.21-3 From 66aecb01329c9fd1813f040b3017ee526982ccb4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 16 Nov 2010 22:01:33 -0500 Subject: [PATCH 044/209] 9.22-1 --- .gitignore | 1 + initscripts.spec | 61 +++++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 47 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 47e54b1..d87b41d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ initscripts-9.16.tar.bz2 /initscripts-9.19.tar.bz2 /initscripts-9.20.tar.bz2 /initscripts-9.21.tar.bz2 +/initscripts-9.22.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 40f84a6..a17b484 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.21 +Version: 9.22 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -20,7 +20,6 @@ Requires: module-init-tools Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87-5 -#Requires: sysvinit-userspace %if %{_with_upstart} Conflicts: upstart < 0.6.0 %if ! %{_with_systemd} @@ -28,8 +27,8 @@ Requires: upstart-sysvinit %endif %endif %if %{_with_systemd} -Conflicts: systemd < 9-3 -Conflicts: systemd-units < 9-3 +Conflicts: systemd < 12-1 +Conflicts: systemd-units < 12-1 %if ! %{_with_upstart} Requires: systemd-sysvinit %endif @@ -67,6 +66,15 @@ 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. +%package legacy +Summary: Support for legacy booting methods +Requires: initscripts = %{version}-%{release} +Group: System Environment/Base + +%description legacy +The initscripts-legacy package contains basic scripts that may be +required to boot the system using older init systems + %package -n debugmode Summary: Scripts for running in debugging mode Requires: initscripts @@ -116,8 +124,6 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif -rm -f $RPM_BUILD_ROOT/lib/systemd/system/default.target - %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -220,6 +226,7 @@ rm -rf $RPM_BUILD_ROOT /etc/init/* %endif %if %{_with_systemd} +/lib/systemd/* /lib/systemd/system/* %endif %config /etc/X11/prefdm @@ -227,15 +234,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 /etc/rc[0-9].d -/etc/rc %dir /etc/rc.d/init.d /etc/rc.local -/etc/rc.sysinit /etc/rc.d/init.d/* -/etc/rc.d/rc +%exclude /etc/rc.d/init.d/halt +%exclude /etc/rc.d/init.d/reboot %config(noreplace) /etc/rc.d/rc.local -/etc/rc.d/rc.sysinit %config(noreplace) /etc/sysctl.conf %exclude /etc/profile.d/debug* /etc/profile.d/* @@ -252,6 +259,8 @@ rm -rf $RPM_BUILD_ROOT /sbin/sushell %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 @@ -277,17 +286,37 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp +%files legacy +%defattr(-,root,root) +%config(noreplace) /etc/inittab +%dir /etc/rc.d +%dir /etc/rc.d/rc[0-9].d +%config(missingok) /etc/rc.d/rc[0-9].d/* +/etc/rc[0-9].d +/etc/rc +%dir /etc/rc.d/init.d +/etc/rc.sysinit +/etc/rc.d/init.d/* +/etc/rc.d/rc +/etc/rc.d/rc.sysinit +/lib/udev/rules.d/* + %files -n debugmode %defattr(-,root,root) %config(noreplace) /etc/sysconfig/debug /etc/profile.d/debug* %changelog -* Thu Oct 7 2010 Bill Nottingham - 9.21-5 -- nuke default.target (conflcit with systemd) - -* Wed Sep 29 2010 jkeating - 9.21-3 -- Rebuilt for gcc bug 634757 +* Tue Nov 16 2010 Bill Nottingham - 9.22-1 +- merge in systemd-specific startup support; package a -legacy package + (based on work by ) +- init-ipv6.global: don't load sit module on shutdown. (#654098, ) +- do not call rhgb-client +- network-functions: add infiniband mapping (#648524, ) +- fix ifdown nmcli invocation (#612934, jklimes@redhat.com>) +- *ipv6*: don't use obsolete /sbin/ip wrapper +- sysconfig.txt: adjust clock docs (#637058) +- lang.csh: fix tcsh + grep-2.7. (#636552) * Fri Sep 17 2010 Bill Nottingham - 9.21-1 - build for systemd only diff --git a/sources b/sources index 700e647..4c69e64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cf6803cff6c1b5875acb00aeaf7620e initscripts-9.21.tar.bz2 +ab30a4dbea46fd7040a6e9932ad1e68b initscripts-9.22.tar.bz2 From 884d2ff0092ff279650e05255cb00276dc31cd37 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 16 Nov 2010 22:20:47 -0500 Subject: [PATCH 045/209] Remove crypttab handling services. --- 48da8e5.patch | 120 +++++++++++++++++++++++++++++++++++++++++++++++ initscripts.spec | 7 ++- 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 48da8e5.patch diff --git a/48da8e5.patch b/48da8e5.patch new file mode 100644 index 0000000..20b4fb1 --- /dev/null +++ b/48da8e5.patch @@ -0,0 +1,120 @@ +commit 48da8e510bca624516172aa144b48a850f0e4ac9 +Author: Bill Nottingham +Date: Tue Nov 16 22:18:58 2010 -0500 + + Don't use our crypto init ; systemd handles this. + +diff --git a/systemd/fedora-init-crypto b/systemd/fedora-init-crypto +deleted file mode 100755 +index 79d18be..0000000 +--- a/systemd/fedora-init-crypto ++++ /dev/null +@@ -1,5 +0,0 @@ +-#!/bin/sh +- +-. /etc/init.d/functions +- +-init_crypto $1 || : +diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init +index 0e3a417..b01a465 100755 +--- a/systemd/fedora-storage-init ++++ b/systemd/fedora-storage-init +@@ -36,5 +36,3 @@ fi + if [ -x /sbin/lvm ]; then + action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit + fi +- +-[ -f /etc/crypttab ] && init_crypto 0 +diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service +index 8cd881d..d7f667d 100644 +--- a/systemd/system/fedora-autoswap.service ++++ b/systemd/system/fedora-autoswap.service +@@ -3,8 +3,8 @@ Description=Enable all detected swap partitions + DefaultDependencies=no + Conflicts=shutdown.target + Before=shutdown.target emergency.service emergency.target +-After=local-fs.target fedora-init-crypto-3.service +-Requires=local-fs.target fedora-init-crypto-3.service ++After=local-fs.target ++Requires=local-fs.target + + [Service] + ExecStart=/lib/systemd/fedora-autoswap +diff --git a/systemd/system/fedora-init-crypto-1.service b/systemd/system/fedora-init-crypto-1.service +deleted file mode 100644 +index 6d6b732..0000000 +--- a/systemd/system/fedora-init-crypto-1.service ++++ /dev/null +@@ -1,15 +0,0 @@ +-[Unit] +-Description=Initialize encrypted storage +-DefaultDependencies=no +-Conflicts=shutdown.target +-Before=shutdown.target emergency.service emergency.target +-After=fedora-wait-storage.service +-Requires=fedora-wait-storage.service +-ConditionPathExists=/etc/crypttab +- +-[Service] +-ExecStart=/lib/systemd/fedora-init-crypto 0 +-Type=oneshot +-TimeoutSec=0 +-RemainAfterExit=yes +-StandardInput=tty +diff --git a/systemd/system/fedora-init-crypto-2.service b/systemd/system/fedora-init-crypto-2.service +deleted file mode 100644 +index c01bbd1..0000000 +--- a/systemd/system/fedora-init-crypto-2.service ++++ /dev/null +@@ -1,15 +0,0 @@ +-[Unit] +-Description=Initialize encrypted filesystems on top of other storage +-DefaultDependencies=no +-Conflicts=shutdown.target +-Before=shutdown.target emergency.service emergency.target +-After=fedora-storage-init.service +-Requires=fedora-storage-init.service +-ConditionPathExists=/etc/crypttab +- +-[Service] +-ExecStart=/lib/systemd/fedora-init-crypto 0 +-Type=oneshot +-TimeoutSec=0 +-RemainAfterExit=yes +-StandardInput=tty +diff --git a/systemd/system/fedora-init-crypto-3.service b/systemd/system/fedora-init-crypto-3.service +deleted file mode 100644 +index 84b11fd..0000000 +--- a/systemd/system/fedora-init-crypto-3.service ++++ /dev/null +@@ -1,15 +0,0 @@ +-[Unit] +-Description=Initialize encrypted filesystems on top of other storage +-DefaultDependencies=no +-Conflicts=shutdown.target +-Before=shutdown.target emergency.service emergency.target +-After=systemd-random-seed-load.service +-Requires=systemd-random-seed-load.service +-ConditionPathExists=/etc/crypttab +- +-[Service] +-ExecStart=/lib/systemd/fedora-init-crypto 1 +-Type=oneshot +-TimeoutSec=0 +-RemainAfterExit=yes +-StandardInput=tty +diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service +index 2806c2d..bd8e02f 100644 +--- a/systemd/system/fedora-storage-init.service ++++ b/systemd/system/fedora-storage-init.service +@@ -3,8 +3,8 @@ Description=Initialize storage subsystems (RAID, LVM, etc.) + DefaultDependencies=no + Conflicts=shutdown.target + Before=shutdown.target local-fs.target emergency.service emergency.target +-After=fedora-wait-storage.service fedora-init-crypto-1.service +-Requires=fedora-wait-storage.service fedora-init-crypto-1.service ++After=fedora-wait-storage.service ++Requires=fedora-wait-storage.service + + [Service] + ExecStart=/lib/systemd/fedora-storage-init diff --git a/initscripts.spec b/initscripts.spec index a17b484..d964769 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.22 # 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 +Patch: 48da8e5.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 +%patch -p1 %build make @@ -307,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Nov 16 2010 Bill Nottingham - 9.22-2 +- remove our own crypttab services in favor of systemd's + * Tue Nov 16 2010 Bill Nottingham - 9.22-1 - merge in systemd-specific startup support; package a -legacy package (based on work by ) From 6aa386890816b81f4d3edfde2d96cc7c33627431 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 2 Dec 2010 14:36:03 -0500 Subject: [PATCH 046/209] 9.23-1 --- .gitignore | 1 + initscripts.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d87b41d..7b7b2b1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ initscripts-9.16.tar.bz2 /initscripts-9.20.tar.bz2 /initscripts-9.21.tar.bz2 /initscripts-9.22.tar.bz2 +/initscripts-9.23.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d964769..73134b9 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.22 +Version: 9.23 # 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 -Patch: 48da8e5.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 -%patch -p1 %build make @@ -287,6 +285,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp +%dir /etc/tmpfiles.d +/etc/tmpfiles.d/initscripts.conf %files legacy %defattr(-,root,root) @@ -309,8 +309,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Tue Nov 16 2010 Bill Nottingham - 9.22-2 -- remove our own crypttab services in favor of systemd's +* Thu Dec 02 2010 Bill Nottingham - 9.23-1 +- don't throw errors on unreadable /dev/stderr (#650103, ) +- support multiple ipv4 addresses, not just alias devices (#132912, #633984, ) +- properly handle /var/run on tmpfs (#656602, ) +- allow '0' as a vlan tag (#624704, #635360) +- assorted systemd unit cleanup () * Tue Nov 16 2010 Bill Nottingham - 9.22-1 - merge in systemd-specific startup support; package a -legacy package diff --git a/sources b/sources index 4c69e64..af4ad12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab30a4dbea46fd7040a6e9932ad1e68b initscripts-9.22.tar.bz2 +bb012b5945caaa5fcf3268188af94337 initscripts-9.23.tar.bz2 From 9e170682de12488fd79892b293e7383811f3ed46 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Dec 2010 15:05:00 -0500 Subject: [PATCH 047/209] Fix routing regression. # Please enter the commit message for your changes. Lines starting --- initscripts.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/initscripts.spec b/initscripts.spec index 73134b9..8166900 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -60,6 +60,8 @@ Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: diff + %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 @@ -88,6 +90,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 %build make @@ -309,6 +312,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Dec 06 2010 Bill Nottingham - 9.23-2 +- fix routing regression (#660363) + * Thu Dec 02 2010 Bill Nottingham - 9.23-1 - don't throw errors on unreadable /dev/stderr (#650103, ) - support multiple ipv4 addresses, not just alias devices (#132912, #633984, ) From 2aafe3c1f3d64bb51126d261a4e201e6f806244e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Dec 2010 15:06:47 -0500 Subject: [PATCH 048/209] bump --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 8166900..1ae7de0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.23 # 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 From 066961f27133f060e07aaef294ca0b867ff624ed Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Dec 2010 15:36:29 -0500 Subject: [PATCH 049/209] Add patch. --- diff | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 diff diff --git a/diff b/diff new file mode 100644 index 0000000..1021a42 --- /dev/null +++ b/diff @@ -0,0 +1,13 @@ +diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth +index dd9fb5e..326eba1 100755 +--- a/sysconfig/network-scripts/ifup-eth ++++ b/sysconfig/network-scripts/ifup-eth +@@ -275,7 +275,7 @@ else + # Set a default route. + if [ "${DEFROUTE}" != "no" ] && [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${REALDEVICE}" ]; then + # set up default gateway. replace if one already exists +- if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${NETMASK} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then ++ if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${netmask[0]} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then + ip route replace default ${METRIC:+metric $METRIC} \ + via ${GATEWAY} ${WINDOW:+window $WINDOW} ${SRC} \ + ${GATEWAYDEV:+dev $GATEWAYDEV} From 02b7a226d14534313fac1ae28dcdc9f3fb342600 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 17 Dec 2010 15:03:21 -0500 Subject: [PATCH 050/209] - accept '#' in ethernet device names (#663904, ) --- ...id-character-in-network-device-names.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 0001-add-as-a-valid-character-in-network-device-names.patch diff --git a/0001-add-as-a-valid-character-in-network-device-names.patch b/0001-add-as-a-valid-character-in-network-device-names.patch new file mode 100644 index 0000000..76ca460 --- /dev/null +++ b/0001-add-as-a-valid-character-in-network-device-names.patch @@ -0,0 +1,25 @@ +From 30df66aeada5bf7987c31443f02d624bf0ef9215 Mon Sep 17 00:00:00 2001 +From: Matt Domsch +Date: Fri, 17 Dec 2010 09:54:29 -0600 +Subject: [PATCH] add # as a valid character in network device names + +--- + rc.d/init.d/network | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/rc.d/init.d/network b/rc.d/init.d/network +index 482bb7b..b31060b 100755 +--- a/rc.d/init.d/network ++++ b/rc.d/init.d/network +@@ -46,7 +46,7 @@ cd /etc/sysconfig/network-scripts + interfaces=$(ls ifcfg* | \ + LANG=C sed -e "$__sed_discard_ignored_files" \ + -e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \ +- -e '/ifcfg-[A-Za-z0-9\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ ++ -e '/ifcfg-[A-Za-z0-9#\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ + LANG=C sort -k 1,1 -k 2n | \ + LANG=C sed 's/ //') + rc=0 +-- +1.7.3.3 + From d9d8eefc2e13b1b69b62b9bd92fed356500ba349 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 17 Dec 2010 15:03:58 -0500 Subject: [PATCH 051/209] - accept '#' in ethernet device names (#663904, ) --- initscripts.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 1ae7de0..8f94a4e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.23 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -61,6 +61,7 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Patch0: diff +Patch1: 0001-add-as-a-valid-character-in-network-device-names.patch %description The initscripts package contains the basic system scripts used to boot @@ -91,6 +92,7 @@ Currently, this consists of various memory checking code. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -312,6 +314,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Dec 17 2010 Bill Nottingham - 9.23-3 +- accept '#' in ethernet device names (#663904, ) + * Mon Dec 06 2010 Bill Nottingham - 9.23-2 - fix routing regression (#660363) From 8f1827e3d32d61f76f15ff8ddbf82ebc7a960104 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 21 Jan 2011 11:46:43 -0500 Subject: [PATCH 052/209] 9.24-1 --- .gitignore | 1 + ...id-character-in-network-device-names.patch | 25 ---- 48da8e5.patch | 120 ------------------ diff | 13 -- initscripts.spec | 28 ++-- sources | 2 +- 6 files changed, 18 insertions(+), 171 deletions(-) delete mode 100644 0001-add-as-a-valid-character-in-network-device-names.patch delete mode 100644 48da8e5.patch delete mode 100644 diff diff --git a/.gitignore b/.gitignore index 7b7b2b1..503ebad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ initscripts-9.16.tar.bz2 /initscripts-9.21.tar.bz2 /initscripts-9.22.tar.bz2 /initscripts-9.23.tar.bz2 +/initscripts-9.24.tar.bz2 diff --git a/0001-add-as-a-valid-character-in-network-device-names.patch b/0001-add-as-a-valid-character-in-network-device-names.patch deleted file mode 100644 index 76ca460..0000000 --- a/0001-add-as-a-valid-character-in-network-device-names.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 30df66aeada5bf7987c31443f02d624bf0ef9215 Mon Sep 17 00:00:00 2001 -From: Matt Domsch -Date: Fri, 17 Dec 2010 09:54:29 -0600 -Subject: [PATCH] add # as a valid character in network device names - ---- - rc.d/init.d/network | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/rc.d/init.d/network b/rc.d/init.d/network -index 482bb7b..b31060b 100755 ---- a/rc.d/init.d/network -+++ b/rc.d/init.d/network -@@ -46,7 +46,7 @@ cd /etc/sysconfig/network-scripts - interfaces=$(ls ifcfg* | \ - LANG=C sed -e "$__sed_discard_ignored_files" \ - -e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \ -- -e '/ifcfg-[A-Za-z0-9\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ -+ -e '/ifcfg-[A-Za-z0-9#\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ - LANG=C sort -k 1,1 -k 2n | \ - LANG=C sed 's/ //') - rc=0 --- -1.7.3.3 - diff --git a/48da8e5.patch b/48da8e5.patch deleted file mode 100644 index 20b4fb1..0000000 --- a/48da8e5.patch +++ /dev/null @@ -1,120 +0,0 @@ -commit 48da8e510bca624516172aa144b48a850f0e4ac9 -Author: Bill Nottingham -Date: Tue Nov 16 22:18:58 2010 -0500 - - Don't use our crypto init ; systemd handles this. - -diff --git a/systemd/fedora-init-crypto b/systemd/fedora-init-crypto -deleted file mode 100755 -index 79d18be..0000000 ---- a/systemd/fedora-init-crypto -+++ /dev/null -@@ -1,5 +0,0 @@ --#!/bin/sh -- --. /etc/init.d/functions -- --init_crypto $1 || : -diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init -index 0e3a417..b01a465 100755 ---- a/systemd/fedora-storage-init -+++ b/systemd/fedora-storage-init -@@ -36,5 +36,3 @@ fi - if [ -x /sbin/lvm ]; then - action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit - fi -- --[ -f /etc/crypttab ] && init_crypto 0 -diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service -index 8cd881d..d7f667d 100644 ---- a/systemd/system/fedora-autoswap.service -+++ b/systemd/system/fedora-autoswap.service -@@ -3,8 +3,8 @@ Description=Enable all detected swap partitions - DefaultDependencies=no - Conflicts=shutdown.target - Before=shutdown.target emergency.service emergency.target --After=local-fs.target fedora-init-crypto-3.service --Requires=local-fs.target fedora-init-crypto-3.service -+After=local-fs.target -+Requires=local-fs.target - - [Service] - ExecStart=/lib/systemd/fedora-autoswap -diff --git a/systemd/system/fedora-init-crypto-1.service b/systemd/system/fedora-init-crypto-1.service -deleted file mode 100644 -index 6d6b732..0000000 ---- a/systemd/system/fedora-init-crypto-1.service -+++ /dev/null -@@ -1,15 +0,0 @@ --[Unit] --Description=Initialize encrypted storage --DefaultDependencies=no --Conflicts=shutdown.target --Before=shutdown.target emergency.service emergency.target --After=fedora-wait-storage.service --Requires=fedora-wait-storage.service --ConditionPathExists=/etc/crypttab -- --[Service] --ExecStart=/lib/systemd/fedora-init-crypto 0 --Type=oneshot --TimeoutSec=0 --RemainAfterExit=yes --StandardInput=tty -diff --git a/systemd/system/fedora-init-crypto-2.service b/systemd/system/fedora-init-crypto-2.service -deleted file mode 100644 -index c01bbd1..0000000 ---- a/systemd/system/fedora-init-crypto-2.service -+++ /dev/null -@@ -1,15 +0,0 @@ --[Unit] --Description=Initialize encrypted filesystems on top of other storage --DefaultDependencies=no --Conflicts=shutdown.target --Before=shutdown.target emergency.service emergency.target --After=fedora-storage-init.service --Requires=fedora-storage-init.service --ConditionPathExists=/etc/crypttab -- --[Service] --ExecStart=/lib/systemd/fedora-init-crypto 0 --Type=oneshot --TimeoutSec=0 --RemainAfterExit=yes --StandardInput=tty -diff --git a/systemd/system/fedora-init-crypto-3.service b/systemd/system/fedora-init-crypto-3.service -deleted file mode 100644 -index 84b11fd..0000000 ---- a/systemd/system/fedora-init-crypto-3.service -+++ /dev/null -@@ -1,15 +0,0 @@ --[Unit] --Description=Initialize encrypted filesystems on top of other storage --DefaultDependencies=no --Conflicts=shutdown.target --Before=shutdown.target emergency.service emergency.target --After=systemd-random-seed-load.service --Requires=systemd-random-seed-load.service --ConditionPathExists=/etc/crypttab -- --[Service] --ExecStart=/lib/systemd/fedora-init-crypto 1 --Type=oneshot --TimeoutSec=0 --RemainAfterExit=yes --StandardInput=tty -diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service -index 2806c2d..bd8e02f 100644 ---- a/systemd/system/fedora-storage-init.service -+++ b/systemd/system/fedora-storage-init.service -@@ -3,8 +3,8 @@ Description=Initialize storage subsystems (RAID, LVM, etc.) - DefaultDependencies=no - Conflicts=shutdown.target - Before=shutdown.target local-fs.target emergency.service emergency.target --After=fedora-wait-storage.service fedora-init-crypto-1.service --Requires=fedora-wait-storage.service fedora-init-crypto-1.service -+After=fedora-wait-storage.service -+Requires=fedora-wait-storage.service - - [Service] - ExecStart=/lib/systemd/fedora-storage-init diff --git a/diff b/diff deleted file mode 100644 index 1021a42..0000000 --- a/diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth -index dd9fb5e..326eba1 100755 ---- a/sysconfig/network-scripts/ifup-eth -+++ b/sysconfig/network-scripts/ifup-eth -@@ -275,7 +275,7 @@ else - # Set a default route. - if [ "${DEFROUTE}" != "no" ] && [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${REALDEVICE}" ]; then - # set up default gateway. replace if one already exists -- if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${NETMASK} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then -+ if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${netmask[0]} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then - ip route replace default ${METRIC:+metric $METRIC} \ - via ${GATEWAY} ${WINDOW:+window $WINDOW} ${SRC} \ - ${GATEWAYDEV:+dev $GATEWAYDEV} diff --git a/initscripts.spec b/initscripts.spec index 8f94a4e..76c7b96 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.23 +Version: 9.24 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 3%{?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 @@ -60,9 +60,6 @@ Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: diff -Patch1: 0001-add-as-a-valid-character-in-network-device-names.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 @@ -91,8 +88,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build make @@ -129,6 +124,8 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif +touch $RPM_BUILD_ROOT/etc/crypttab + %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -290,6 +287,7 @@ rm -rf $RPM_BUILD_ROOT %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 /etc/tmpfiles.d /etc/tmpfiles.d/initscripts.conf @@ -314,11 +312,17 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Fri Dec 17 2010 Bill Nottingham - 9.23-3 -- accept '#' in ethernet device names (#663904, ) - -* Mon Dec 06 2010 Bill Nottingham - 9.23-2 -- fix routing regression (#660363) +* Fri Jan 21 2010 Bill Nottingham - 9.24-1 +- ifup-eth/ifdown-eth: handle 'MASTER' being quoted. (#651450, ) +- tmpfiles.d: remove entries that exist in systemd +- frob device when calling sysctl, in case of vlans. (#665601, #667211, ) +- netfs: rework to handle bind-mounted cifs/ncpfs (#663140, ) +- own /etc/crypttab (#664309) +- init.d/network: add # as a valid character in network device names () +- ifup-eth: fix routing regression (#660363) +- sysctl.conf.s390 - system z optimized sysctl settings per default (#633323, ) +- serial.conf, tty.conf: stop tty and serial also on runlevel 's' (#629257, ) +- translation updates: bn_IN, es, gu, hi, nds, or, pa, uk, zh_CN * Thu Dec 02 2010 Bill Nottingham - 9.23-1 - don't throw errors on unreadable /dev/stderr (#650103, ) diff --git a/sources b/sources index af4ad12..64cf3ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb012b5945caaa5fcf3268188af94337 initscripts-9.23.tar.bz2 +435f176a962d45c320bd510d7ed9436a initscripts-9.24.tar.bz2 From 3c2f7d5a406fd0845106d7fb874775b5cd4ed615 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 21 Jan 2011 11:47:14 -0500 Subject: [PATCH 053/209] Stop living in the past! --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 76c7b96..df50fd2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -312,7 +312,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Fri Jan 21 2010 Bill Nottingham - 9.24-1 +* Fri Jan 21 2011 Bill Nottingham - 9.24-1 - ifup-eth/ifdown-eth: handle 'MASTER' being quoted. (#651450, ) - tmpfiles.d: remove entries that exist in systemd - frob device when calling sysctl, in case of vlans. (#665601, #667211, ) From 4ae876cf426e818fd1df17af6e4d5fc4e9e604e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 06:36:12 -0600 Subject: [PATCH 054/209] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index df50fd2..073177f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.24 # 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 @@ -312,6 +312,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 9.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jan 21 2011 Bill Nottingham - 9.24-1 - ifup-eth/ifdown-eth: handle 'MASTER' being quoted. (#651450, ) - tmpfiles.d: remove entries that exist in systemd From 6104485508728427907d8764f01d81f60ddb1d9f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Feb 2011 15:17:03 -0500 Subject: [PATCH 055/209] 9.25-1 --- .gitignore | 10 +--------- initscripts.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 503ebad..83a3108 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -initscripts-9.16.tar.bz2 -/initscripts-9.17.tar.bz2 -/initscripts-9.18.tar.bz2 -/initscripts-9.19.tar.bz2 -/initscripts-9.20.tar.bz2 -/initscripts-9.21.tar.bz2 -/initscripts-9.22.tar.bz2 -/initscripts-9.23.tar.bz2 -/initscripts-9.24.tar.bz2 +/initscripts-9.25.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 073177f..3d91ac3 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.24 +Version: 9.25 # 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 @@ -312,8 +312,13 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Feb 09 2011 Fedora Release Engineering - 9.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Fri Feb 25 2011 Bill Nottingham - 9.25-1 +- remove 'Red Hat Linux' references from sysctl.conf* () +- rc.sysinit: add support for sysctl.d (#593211, ) +- console_check: support OMAP serial console (#678875, ) +- /sbin/service: accept --ignore-dependencies, --skip-redirect as options +- /sbin/service: honor SYSTEMCTL_IGNORE_DEPENDENCIES () +- translation updates: kn, pa, ta, uk * Fri Jan 21 2011 Bill Nottingham - 9.24-1 - ifup-eth/ifdown-eth: handle 'MASTER' being quoted. (#651450, ) diff --git a/sources b/sources index 64cf3ff..6667dc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -435f176a962d45c320bd510d7ed9436a initscripts-9.24.tar.bz2 +a2ea61a4c74c6998f97ae1c267d4440b initscripts-9.25.tar.bz2 From aba3aa462f37df27bb9c77985af393ddd5325845 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 10 Mar 2011 16:00:46 -0500 Subject: [PATCH 056/209] 9.26-1 --- .gitignore | 1 + initscripts.spec | 15 ++++++++++++++- sources | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 83a3108..93f19f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.25.tar.bz2 +/initscripts-9.26.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 3d91ac3..9a49593 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.26 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -312,6 +312,19 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Mar 10 2011 Bill Nottingham - 9.26-1 +- network-functions: fix check for unmanaged devices (#670154) +- ifup-eth: also check /dev/.run/initramfs () +- systemd: execute fedora-sysinit-unhack after sysinit.target () +- init.d/functions: don't do force/lazy umount for the first nfs umount. (#676851, ) +- further sysctl.d fixes (#593211) +- init.d/functions: make killproc more granular when delay is passed. (#428029, ) +- ifup: add GVRP support (#597598, ) +- init.d/functions: add support for noauto crypt devices, to mirror systemd +- documentation updates +- bash cleanups () +- ifup: remove network device naming requirement from VLAN devices (#462095, ) + * Fri Feb 25 2011 Bill Nottingham - 9.25-1 - remove 'Red Hat Linux' references from sysctl.conf* () - rc.sysinit: add support for sysctl.d (#593211, ) diff --git a/sources b/sources index 6667dc4..7cf8fa4 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a2ea61a4c74c6998f97ae1c267d4440b initscripts-9.25.tar.bz2 +231ea6dc35f20081325aca3e1e3ff92d initscripts-9.26.tar.bz2 From 9ad80a31c1ff9994e120577357432bd331c23144 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 17 Mar 2011 12:34:47 -0400 Subject: [PATCH 057/209] 9.27-1 --- .gitignore | 3 +-- initscripts.spec | 7 ++++++- sources | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 93f19f9..d134e07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/initscripts-9.25.tar.bz2 -/initscripts-9.26.tar.bz2 +/initscripts-9.27.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9a49593..c7d7fbe 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.26 +Version: 9.27 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -312,6 +312,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Mar 17 2011 Bill Nottingham - 9.27-1 +- init.d/functions: fix mishandled argument to fstab-decode. (#685137) +- support ipv6 routing rules, merge route/rule code (#680872, ) +- autorelabel.service, loadmodules.service: fix conditions so that they operate as OR, not AND. (#684125) + * Thu Mar 10 2011 Bill Nottingham - 9.26-1 - network-functions: fix check for unmanaged devices (#670154) - ifup-eth: also check /dev/.run/initramfs () diff --git a/sources b/sources index 7cf8fa4..c6881a3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a2ea61a4c74c6998f97ae1c267d4440b initscripts-9.25.tar.bz2 -231ea6dc35f20081325aca3e1e3ff92d initscripts-9.26.tar.bz2 +ffc00a2ddc1174a9255cb37cc78e91f7 initscripts-9.27.tar.bz2 From 1807e68090b25cd35eac6b0adfcab04bd36d1a4d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Mar 2011 16:40:08 -0400 Subject: [PATCH 058/209] 9.28-1 --- .gitignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d134e07..5bd39b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.27.tar.bz2 +/initscripts-9.28.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index c7d7fbe..5eca359 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.27 +Version: 9.28 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -312,6 +312,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Mar 25 2011 Bill Nottingham - 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 - 9.27-1 - init.d/functions: fix mishandled argument to fstab-decode. (#685137) - support ipv6 routing rules, merge route/rule code (#680872, ) diff --git a/sources b/sources index c6881a3..6262ded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffc00a2ddc1174a9255cb37cc78e91f7 initscripts-9.27.tar.bz2 +8c6096fc50b4fd9fa79146bd4b56b6b4 initscripts-9.28.tar.bz2 From 5c23e7c36962670c5cd5d45a8dff418cc863544b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 6 Apr 2011 16:23:32 -0400 Subject: [PATCH 059/209] 9.29-1 --- .gitignore | 2 +- initscripts.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5bd39b2..493f3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.28.tar.bz2 +/initscripts-9.29.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 5eca359..7844440 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.28 +Version: 9.29 # 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 @@ -125,6 +125,7 @@ rm -f \ %endif touch $RPM_BUILD_ROOT/etc/crypttab +chmod 600 $RPM_BUILD_ROOT/etc/crypttab %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -312,6 +313,13 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Apr 06 2011 Bill Nottingham - 9.29-1 +- systemd: add a storage setup service after cryptsetup.target (#692198) +- fix /.autorelabel handling () +- 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 () + * Fri Mar 25 2011 Bill Nottingham - 9.28-1 - add some generic network logging, port scripts to it (#507515, #653630) - add an error when setting the gateway fails (#672202) diff --git a/sources b/sources index 6262ded..24fdf16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c6096fc50b4fd9fa79146bd4b56b6b4 initscripts-9.28.tar.bz2 +7c0674c69e389f4855c0a3bdde31b73d initscripts-9.29.tar.bz2 From 748d26b54a3ca978690632bdae7464992900cd1e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 13:24:51 -0400 Subject: [PATCH 060/209] Update to 9.30 --- .gitignore | 2 +- initscripts.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 493f3a3..bed8bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.29.tar.bz2 +/initscripts-9.30.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 7844440..858afd1 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.29 +Version: 9.30 # 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/init.d/single %config(noreplace) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf %exclude /etc/profile.d/debug* @@ -313,6 +314,16 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* 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 () +- 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 () +- ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, ) +- ifup-eth: ensure bond exists before bringing up slaves (#694501) + * Wed Apr 06 2011 Bill Nottingham - 9.29-1 - systemd: add a storage setup service after cryptsetup.target (#692198) - fix /.autorelabel handling () diff --git a/sources b/sources index 24fdf16..a6e7960 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c0674c69e389f4855c0a3bdde31b73d initscripts-9.29.tar.bz2 +504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2 From 4c3a9506dd6cd332eb895362a29392db78c7a667 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 21 Jun 2011 15:45:28 -0400 Subject: [PATCH 061/209] 9.31-1 --- .gitignore | 1 + initscripts.spec | 18 +++++++++++++++--- sources | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bed8bc2..37a3359 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.30.tar.bz2 +/initscripts-9.31.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 858afd1..e35161d 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.30 +Version: 9.31 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -54,6 +54,7 @@ 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: ipsec-tools < 0.8.0-2 Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils @@ -204,8 +205,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 @@ -245,6 +244,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 +314,18 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Jun 21 2011 Bill Nottingham - 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, ) +- 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 ) +- 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, ) + * 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) diff --git a/sources b/sources index a6e7960..5743bb2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2 +885929d864bebdd59c37734ea36f1698 initscripts-9.31.tar.bz2 From 067b5ca6da8bb0ffc334f3fc3010d98226845d17 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 22 Jul 2011 13:41:15 -0400 Subject: [PATCH 062/209] Add patch for multipath/udev issue. (#723357, ) --- initscripts.spec | 7 ++++++- multipath-nosync.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 multipath-nosync.patch diff --git a/initscripts.spec b/initscripts.spec index e35161d..1d0f0a9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.31 # 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 @@ -60,6 +60,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: multipath-nosync.patch %description The initscripts package contains the basic system scripts used to boot @@ -89,6 +90,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 %build make @@ -314,6 +316,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Jul 22 2011 Bill Nottingham - 9.31-2 +- work around multipath/udev incompatibility (#723357, ) + * Tue Jun 21 2011 Bill Nottingham - 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) diff --git a/multipath-nosync.patch b/multipath-nosync.patch new file mode 100644 index 0000000..642ccf9 --- /dev/null +++ b/multipath-nosync.patch @@ -0,0 +1,12 @@ +diff -urpN initscripts-9.31/systemd/fedora-storage-init initscripts-9.31-patched/systemd/fedora-storage-init +--- initscripts-9.31/systemd/fedora-storage-init 2011-06-21 14:41:29.000000000 -0500 ++++ initscripts-9.31-patched/systemd/fedora-storage-init 2011-07-19 11:44:30.421998951 -0500 +@@ -9,7 +9,7 @@ + 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 -n -v 0 + if [ -x /sbin/kpartx ]; then + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null + fi From 6c00bf15984c003e61a9bf96a313dca443170e90 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 25 Jul 2011 15:06:15 -0400 Subject: [PATCH 063/209] Remove fedora-sysinit-hack/unhack --- initscripts.spec | 7 +++++- remove-hack.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 remove-hack.patch diff --git a/initscripts.spec b/initscripts.spec index 1d0f0a9..f8872a1 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.31 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 @@ -61,6 +61,7 @@ Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Patch0: multipath-nosync.patch +Patch1: remove-hack.patch %description The initscripts package contains the basic system scripts used to boot @@ -91,6 +92,7 @@ Currently, this consists of various memory checking code. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -316,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Jul 25 2011 Bill Nottingham - 9.31-3 +- remove fedora-sysinit-hack/unhack; they're not needed with /var/lock/subsys on tmpfs + * Fri Jul 22 2011 Bill Nottingham - 9.31-2 - work around multipath/udev incompatibility (#723357, ) diff --git a/remove-hack.patch b/remove-hack.patch new file mode 100644 index 0000000..bdef61b --- /dev/null +++ b/remove-hack.patch @@ -0,0 +1,55 @@ +commit b710648dee63466be01b34b21d929ada422f2845 +Author: Bill Nottingham +Date: Mon Jul 25 13:34:12 2011 -0400 + + Remove fedora-sysinit-hack/fedora-sysinit-unhack; they're not needed with /var/lock on tmpfs. + +diff --git a/Makefile b/Makefile +index 718b451..1e8c09e 100644 +--- a/Makefile ++++ b/Makefile +@@ -127,11 +127,9 @@ install: + 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-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants +- ln -s ../fedora-sysinit-hack.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-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants +- ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants + + mkdir -p $(ROOT)/etc/tmpfiles.d + install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf +diff --git a/systemd/system/fedora-sysinit-hack.service b/systemd/system/fedora-sysinit-hack.service +deleted file mode 100644 +index dd78da8..0000000 +--- 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 221d8bb..0000000 +--- 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 From 52f41a09021d6ec271f97bdbe92e56fd90a25294 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 Sep 2011 15:47:55 -0400 Subject: [PATCH 064/209] 9.32-1 --- .gitignore | 1 + initscripts.spec | 47 ++++++++++++++++++++++-------------- multipath-nosync.patch | 12 --------- remove-hack.patch | 55 ------------------------------------------ sources | 1 + 5 files changed, 31 insertions(+), 85 deletions(-) delete mode 100644 multipath-nosync.patch delete mode 100644 remove-hack.patch diff --git a/.gitignore b/.gitignore index 37a3359..db4d858 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /initscripts-9.30.tar.bz2 /initscripts-9.31.tar.bz2 +/initscripts-9.32.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index f8872a1..97a7666 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.31 +Version: 9.32 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 3%{?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 @@ -54,14 +54,13 @@ 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 Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: multipath-nosync.patch -Patch1: remove-hack.patch %description The initscripts package contains the basic system scripts used to boot @@ -91,8 +90,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build make @@ -132,6 +129,10 @@ rm -f \ 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 @@ -240,17 +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 -%exclude /etc/rc.d/rc[0-9].d/*single %exclude /etc/rc.d/init.d/single -%config(noreplace) /etc/rc.d/rc.local +%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/* @@ -270,8 +269,6 @@ rm -rf $RPM_BUILD_ROOT %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*/* @@ -311,6 +308,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) @@ -318,11 +317,23 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Jul 25 2011 Bill Nottingham - 9.31-3 -- remove fedora-sysinit-hack/unhack; they're not needed with /var/lock/subsys on tmpfs - -* Fri Jul 22 2011 Bill Nottingham - 9.31-2 -- work around multipath/udev incompatibility (#723357, ) +* Fri Sep 2 2011 Bill Nottingham - 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, ) +- 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 - 9.31-1 - remove ifup/ifdown-ipsec; they're now in ipsec-tools diff --git a/multipath-nosync.patch b/multipath-nosync.patch deleted file mode 100644 index 642ccf9..0000000 --- a/multipath-nosync.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN initscripts-9.31/systemd/fedora-storage-init initscripts-9.31-patched/systemd/fedora-storage-init ---- initscripts-9.31/systemd/fedora-storage-init 2011-06-21 14:41:29.000000000 -0500 -+++ initscripts-9.31-patched/systemd/fedora-storage-init 2011-07-19 11:44:30.421998951 -0500 -@@ -9,7 +9,7 @@ - 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 -n -v 0 - if [ -x /sbin/kpartx ]; then - /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null - fi diff --git a/remove-hack.patch b/remove-hack.patch deleted file mode 100644 index bdef61b..0000000 --- a/remove-hack.patch +++ /dev/null @@ -1,55 +0,0 @@ -commit b710648dee63466be01b34b21d929ada422f2845 -Author: Bill Nottingham -Date: Mon Jul 25 13:34:12 2011 -0400 - - Remove fedora-sysinit-hack/fedora-sysinit-unhack; they're not needed with /var/lock on tmpfs. - -diff --git a/Makefile b/Makefile -index 718b451..1e8c09e 100644 ---- a/Makefile -+++ b/Makefile -@@ -127,11 +127,9 @@ install: - 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-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants -- ln -s ../fedora-sysinit-hack.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-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants -- ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants - - mkdir -p $(ROOT)/etc/tmpfiles.d - install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf -diff --git a/systemd/system/fedora-sysinit-hack.service b/systemd/system/fedora-sysinit-hack.service -deleted file mode 100644 -index dd78da8..0000000 ---- 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 221d8bb..0000000 ---- 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/sources b/sources index 5743bb2..b5a0657 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2 885929d864bebdd59c37734ea36f1698 initscripts-9.31.tar.bz2 +4a8c9d2d860ed142b4c84d924ff4b812 initscripts-9.32.tar.bz2 From 11c17fbf3798b0c0eb49ae0f10498a3a958ab22d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 19 Sep 2011 17:49:02 -0400 Subject: [PATCH 065/209] Clean up consoletype-related noise. --- ...b5033230e6846414bc6002aa12ce09c23687.patch | 25 +++++++++++++++++++ initscripts.spec | 7 +++++- sources | 2 -- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 09bfb5033230e6846414bc6002aa12ce09c23687.patch diff --git a/09bfb5033230e6846414bc6002aa12ce09c23687.patch b/09bfb5033230e6846414bc6002aa12ce09c23687.patch new file mode 100644 index 0000000..69409eb --- /dev/null +++ b/09bfb5033230e6846414bc6002aa12ce09c23687.patch @@ -0,0 +1,25 @@ +commit 09bfb5033230e6846414bc6002aa12ce09c23687 +Author: Bill Nottingham +Date: Mon Sep 19 17:45:17 2011 -0400 + + Only bother with consoletype if we're actually connected to something that's console-ish. (#657869) + + If we're connected to a socket, or a pipe, or a file, or anything else - assume dumb mode. + +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 79545b5..e313e35 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions +@@ -54,10 +54,10 @@ systemctl_redirect () { + [ -z "${COLUMNS:-}" ] && COLUMNS=80 + + if [ -z "${CONSOLETYPE:-}" ]; then +- if [ -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" ]; then + CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" + else +- CONSOLETYPE="$(/sbin/consoletype 2>/dev/null)" ++ CONSOLETYPE="serial" + fi + fi + diff --git a/initscripts.spec b/initscripts.spec index 97a7666..7b957b9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.32 # 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 @@ -61,6 +61,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch1: 09bfb5033230e6846414bc6002aa12ce09c23687.patch %description The initscripts package contains the basic system scripts used to boot @@ -90,6 +91,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch1 -p1 %build make @@ -317,6 +319,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Sep 19 2011 Bill Nottingham - 9.32-2 +- clean up consoletype-related error messages (#735618) + * Fri Sep 2 2011 Bill Nottingham - 9.32-1 - prefdm: if exec() of all DMs fails, call 'plymouth quit' (#735215) - %%ghost rc.local (but leave it around on upgrade) (#734268) diff --git a/sources b/sources index b5a0657..50809d3 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2 -885929d864bebdd59c37734ea36f1698 initscripts-9.31.tar.bz2 4a8c9d2d860ed142b4c84d924ff4b812 initscripts-9.32.tar.bz2 From 3e01f149294d0ad93707f16954289d3b4c275bd6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 16:53:52 -0400 Subject: [PATCH 066/209] Update to 9.33 --- .gitignore | 4 +--- initscripts.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index db4d858..885f62a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/initscripts-9.30.tar.bz2 -/initscripts-9.31.tar.bz2 -/initscripts-9.32.tar.bz2 +/initscripts-9.33.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 7b957b9..51c5f70 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.32 +Version: 9.33 # 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 @@ -61,7 +61,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch1: 09bfb5033230e6846414bc6002aa12ce09c23687.patch %description The initscripts package contains the basic system scripts used to boot @@ -91,7 +90,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch1 -p1 %build make @@ -319,8 +317,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Sep 19 2011 Bill Nottingham - 9.32-2 -- clean up consoletype-related error messages (#735618) +* Wed Oct 12 2011 Bill Nottingham - 9.33-1 +- netconsole: only use the first ARP response (#744309, ) +- 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 () +- init.d/functions: only run consoletype if connected to something that's console-ish. (#657869) * Fri Sep 2 2011 Bill Nottingham - 9.32-1 - prefdm: if exec() of all DMs fails, call 'plymouth quit' (#735215) diff --git a/sources b/sources index 50809d3..507cca8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a8c9d2d860ed142b4c84d924ff4b812 initscripts-9.32.tar.bz2 +02badee8515a3fddf853bd6316c16ced initscripts-9.33.tar.bz2 From 870a56405c7fdd369e052c20bbcf367fa36c1241 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 17:03:15 -0400 Subject: [PATCH 067/209] Fix build --- initscripts.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 51c5f70..47290eb 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -267,7 +267,6 @@ 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 /sbin/service /sbin/ppp-watch From c9173e1a0e5d2e1acc858f8aa7176189c88bd082 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 25 Oct 2011 15:36:39 -0400 Subject: [PATCH 068/209] 9.34-1 plus a patch --- .gitignore | 1 + ...b5033230e6846414bc6002aa12ce09c23687.patch | 25 ------------------- initscripts.spec | 11 ++++++-- sources | 1 + 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 09bfb5033230e6846414bc6002aa12ce09c23687.patch diff --git a/.gitignore b/.gitignore index 885f62a..3e93db8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.33.tar.bz2 +/initscripts-9.34.tar.bz2 diff --git a/09bfb5033230e6846414bc6002aa12ce09c23687.patch b/09bfb5033230e6846414bc6002aa12ce09c23687.patch deleted file mode 100644 index 69409eb..0000000 --- a/09bfb5033230e6846414bc6002aa12ce09c23687.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 09bfb5033230e6846414bc6002aa12ce09c23687 -Author: Bill Nottingham -Date: Mon Sep 19 17:45:17 2011 -0400 - - Only bother with consoletype if we're actually connected to something that's console-ish. (#657869) - - If we're connected to a socket, or a pipe, or a file, or anything else - assume dumb mode. - -diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions -index 79545b5..e313e35 100644 ---- a/rc.d/init.d/functions -+++ b/rc.d/init.d/functions -@@ -54,10 +54,10 @@ systemctl_redirect () { - [ -z "${COLUMNS:-}" ] && COLUMNS=80 - - if [ -z "${CONSOLETYPE:-}" ]; then -- if [ -r "/dev/stderr" ]; then -+ if [ -c "/dev/stderr" ]; then - CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" - else -- CONSOLETYPE="$(/sbin/consoletype 2>/dev/null)" -+ CONSOLETYPE="serial" - fi - fi - diff --git a/initscripts.spec b/initscripts.spec index 47290eb..56e208c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,13 +4,14 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.33 +Version: 9.34 # 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 +Patch: 807a7f3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -90,6 +91,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch -p1 %build make @@ -316,6 +318,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Oct 25 2011 Bill Nottingham - 9.34-2 +- read locale.conf if it exists (#706756) +- ifdown: fix logic error with removing arp_ip_target (#745681) +- service: don't write to stderr that's not there (#746263) + * Wed Oct 12 2011 Bill Nottingham - 9.33-1 - netconsole: only use the first ARP response (#744309, ) - udev/rules.d/88-clock.rules: drop this entirely, as it causes issues in conjunction with systemd diff --git a/sources b/sources index 507cca8..9af76c7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 02badee8515a3fddf853bd6316c16ced initscripts-9.33.tar.bz2 +b0c99414b92dc6d87bef7d9f762c567c initscripts-9.34.tar.bz2 From ef8481f550409475b270310e43e65caec88b037a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 25 Oct 2011 15:43:04 -0400 Subject: [PATCH 069/209] add patch --- 807a7f3.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 807a7f3.patch diff --git a/807a7f3.patch b/807a7f3.patch new file mode 100644 index 0000000..5049915 --- /dev/null +++ b/807a7f3.patch @@ -0,0 +1,18 @@ +commit 807a7f34cd58c537d8b361694d0a4bad23d8aff9 +Author: Bill Nottingham +Date: Tue Oct 25 15:32:53 2011 -0400 + + Don't write to stderr that's not there (or a socket, or whatever, #746263) + +diff --git a/service b/service +index 6f17934..2e2d4ea 100755 +--- a/service ++++ b/service +@@ -69,6 +69,6 @@ done + if [ -f "${SERVICEDIR}/${SERVICE}" ]; then + env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${OPTIONS} + else +- echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr ++ [ -c /dev/stderr ] && echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr + exec /bin/systemctl ${OPTIONS} ${SERVICE}.service + fi From 019f719dc2bb5484fc534f71036984560ba3bd66 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 29 Dec 2011 16:14:14 +0000 Subject: [PATCH 070/209] update util-linux-ng -> util-linux --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 56e208c..fbab9f9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools -Requires: util-linux-ng >= 2.16 +Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87-5 %if %{_with_upstart} From 2ca8bdedf3999be08dba1f3c2aef46966b9adb49 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 29 Dec 2011 16:18:17 +0000 Subject: [PATCH 071/209] mktemp was long obsoleted by coreutils --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index fbab9f9..412192c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -13,7 +13,7 @@ URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 Patch: 807a7f3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: mingetty, /bin/awk, /bin/sed, mktemp +Requires: mingetty, /bin/awk, /bin/sed, coreutils Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid From c6fdeed32013bfeaaed47f489bf7d55d3c336898 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 23:50:31 -0600 Subject: [PATCH 072/209] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 412192c..d373d48 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.34 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 Patch: 807a7f3.patch @@ -318,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 9.34-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Oct 25 2011 Bill Nottingham - 9.34-2 - read locale.conf if it exists (#706756) - ifdown: fix logic error with removing arp_ip_target (#745681) From 0d1e704f9c47cc8d41ee52102d00a0207ad14273 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Mar 2012 11:35:36 -0500 Subject: [PATCH 073/209] 9.35-1 --- .gitignore | 3 +-- initscripts.spec | 42 +++++++++++++++++++++++++++++++----------- sources | 3 +-- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 3e93db8..d84397f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/initscripts-9.33.tar.bz2 -/initscripts-9.34.tar.bz2 +/initscripts-9.35.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d373d48..395311c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,14 +4,13 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.34 +Version: 9.35 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 3%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch: 807a7f3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, coreutils Requires: /sbin/sysctl @@ -91,7 +90,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch -p1 %build make @@ -144,7 +142,6 @@ 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 -/sbin/chkconfig --add netfs /sbin/chkconfig --add network /sbin/chkconfig --add netconsole %if %{_with_systemd} @@ -160,6 +157,14 @@ if [ $1 = 0 ]; then /sbin/chkconfig --del netconsole fi +%post legacy +/sbin/chkconfig --add netfs + +%preun legacy +if [ $1 = 0 ; then + /sbin/chkconfig --del netfs +fi + %triggerun -- initscripts < 7.62 /sbin/chkconfig --del random /sbin/chkconfig --del rawdevices @@ -247,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT /etc/rc[0-9].d %dir /etc/rc.d/init.d /etc/rc.d/init.d/* +%exclude /etc/rc.d/init.d/netfs %exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/killall %exclude /etc/rc.d/init.d/reboot @@ -264,7 +270,6 @@ rm -rf $RPM_BUILD_ROOT /sbin/fstab-decode /sbin/genhostid /sbin/getkey -/sbin/securetty /sbin/sushell %attr(2755,root,root) /sbin/netreport /lib/udev/rules.d/* @@ -273,6 +278,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/service /sbin/ppp-watch %{_mandir}/man*/* +%exclude %{_mandir}/man*/securetty* %dir %attr(775,root,root) /var/run/netreport %dir /etc/ppp %dir /etc/ppp/peers @@ -285,7 +291,6 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport -/etc/NetworkManager/dispatcher.d/05-netfs %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp @@ -298,6 +303,7 @@ rm -rf $RPM_BUILD_ROOT %files legacy %defattr(-,root,root) %config(noreplace) /etc/inittab +/etc/NetworkManager/dispatcher.d/05-netfs %dir /etc/rc.d %dir /etc/rc.d/rc[0-9].d %config(missingok) /etc/rc.d/rc[0-9].d/* @@ -311,6 +317,8 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rules.d/* /lib/udev/console_init /lib/udev/console_check +/sbin/securetty +%{_mandir}/man*/securetty* %files -n debugmode %defattr(-,root,root) @@ -318,13 +326,25 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Fri Jan 13 2012 Fedora Release Engineering - 9.34-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Fri Mar 9 2012 Bill Nottingham - 9.35-1 +- use the same DHCP lease file names as NetworkManager, where appropriate +- copy network state from initramfs with a systemd service, not inline () +- sysconfig.txt: clean up section on disabling IPv6 +- ifup: allow for ifup-$TYPE/ifdown-$TYPE +- fedora-readonly.service: drop StandardInput=tty (#785662) +- sysconfig.txt: document additional ETHTOOL_OPTS enhancements () +- port assorted ancient ifup-XYZ scripts away from ifconfig +- don't use ifconfig in ifup-aliases (#721010, 588993, based on ) +- fedora-storage-init: handle dmraid sets with spaces (#728795, ) +- fedora-readonly: don't exit with an error if SEinux isn't active. (#768628) +- init.d/network: fix checks for network filesystems (#760018) +- fedora-wait-storage: drop stdin/stdout/stderr (#735867) +- netfs: move to legacy package +- translation updates -* Tue Oct 25 2011 Bill Nottingham - 9.34-2 +* Tue Oct 25 2011 Bill Nottingham - 9.34-1 - read locale.conf if it exists (#706756) - ifdown: fix logic error with removing arp_ip_target (#745681) -- service: don't write to stderr that's not there (#746263) * Wed Oct 12 2011 Bill Nottingham - 9.33-1 - netconsole: only use the first ARP response (#744309, ) diff --git a/sources b/sources index 9af76c7..400d62a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -02badee8515a3fddf853bd6316c16ced initscripts-9.33.tar.bz2 -b0c99414b92dc6d87bef7d9f762c567c initscripts-9.34.tar.bz2 +b695e6b4302a1036845e518784749f87 initscripts-9.35.tar.bz2 From 34a8a952b8209b20346e4621d8e18aab76facc3d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Mar 2012 11:45:43 -0500 Subject: [PATCH 074/209] Dead patch. --- 807a7f3.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 807a7f3.patch diff --git a/807a7f3.patch b/807a7f3.patch deleted file mode 100644 index 5049915..0000000 --- a/807a7f3.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 807a7f34cd58c537d8b361694d0a4bad23d8aff9 -Author: Bill Nottingham -Date: Tue Oct 25 15:32:53 2011 -0400 - - Don't write to stderr that's not there (or a socket, or whatever, #746263) - -diff --git a/service b/service -index 6f17934..2e2d4ea 100755 ---- a/service -+++ b/service -@@ -69,6 +69,6 @@ done - if [ -f "${SERVICEDIR}/${SERVICE}" ]; then - env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${OPTIONS} - else -- echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr -+ [ -c /dev/stderr ] && echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr - exec /bin/systemctl ${OPTIONS} ${SERVICE}.service - fi From ceaa03281f37658599d1f47049e3edc39762dd68 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 12 Mar 2012 14:16:01 -0400 Subject: [PATCH 075/209] 9.36-1 --- .gitignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d84397f..6a81514 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.35.tar.bz2 +/initscripts-9.36.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 395311c..14c1835 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.35 +Version: 9.36 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -326,6 +326,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Mar 12 2012 Bill Nottingham - 9.36-1 +- ifup-aliases: fix IFS usage mangling of device names (#802119) +- ifup/ifdown: fix typo (#802055, ) + * Fri Mar 9 2012 Bill Nottingham - 9.35-1 - use the same DHCP lease file names as NetworkManager, where appropriate - copy network state from initramfs with a systemd service, not inline () diff --git a/sources b/sources index 400d62a..59e658d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b695e6b4302a1036845e518784749f87 initscripts-9.35.tar.bz2 +3b3418824823db8d532dca416a3b7e15 initscripts-9.36.tar.bz2 From 77b45d9a00d83f511383c29af1339ed44f3b2815 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 14 Mar 2012 14:45:00 -0400 Subject: [PATCH 076/209] Fix typo in scriptlet. Yes, I am an idiot for not checking this. --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 14c1835..55af997 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.36 # 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 @@ -161,7 +161,7 @@ fi /sbin/chkconfig --add netfs %preun legacy -if [ $1 = 0 ; then +if [ $1 = 0 ]; then /sbin/chkconfig --del netfs fi @@ -326,6 +326,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Mar 14 2012 Bill Nottingham - 9.36-2 +- fix -legacy typo (#803449) + * Mon Mar 12 2012 Bill Nottingham - 9.36-1 - ifup-aliases: fix IFS usage mangling of device names (#802119) - ifup/ifdown: fix typo (#802055, ) From e7c935bc153812997ef018bb5fb24572d1773a08 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 16 Mar 2012 10:28:56 -0400 Subject: [PATCH 077/209] 9.37-1 --- .gitignore | 2 +- initscripts.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6a81514..6aa8229 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.36.tar.bz2 +/initscripts-9.37.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 55af997..55e2833 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.36 +Version: 9.37 # 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 @@ -326,8 +326,8 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Mar 14 2012 Bill Nottingham - 9.36-2 -- fix -legacy typo (#803449) +* Fri Mar 16 2012 Bill Nottingham - 9.37-1 +- Add support for firewalld zones (#802415, from ) * Mon Mar 12 2012 Bill Nottingham - 9.36-1 - ifup-aliases: fix IFS usage mangling of device names (#802119) diff --git a/sources b/sources index 59e658d..f7b4ec0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b3418824823db8d532dca416a3b7e15 initscripts-9.36.tar.bz2 +7961b1d2180e2fe8d5bd9c04fe5cd17c initscripts-9.37.tar.bz2 From 414bd21ae2648890323bc29852843eb20c585af1 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 29 May 2012 22:52:09 +0200 Subject: [PATCH 078/209] fix udev units in fedora-wait-storage.service for rawhide systemd --- initscripts.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 55e2833..7abbb47 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.37 # 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 @@ -97,6 +97,11 @@ make %install rm -rf $RPM_BUILD_ROOT make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install +# temporary fix for renamed unit file +sed -i 's/udev-settle.service/systemd-udev-settle.service/' \ + $RPM_BUILD_ROOT/lib/systemd/system/fedora-wait-storage.service > /dev/null 2>&1 || : +sed -i 's/udev.service/systemd-udev.service/'\ + $RPM_BUILD_ROOT/lib/systemd/system/fedora-wait-storage.service > /dev/null 2>&1 || : %find_lang %{name} @@ -326,6 +331,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue May 29 2012 Kay Sievers - 9.37-2 +- temporary fix for renamed systemd-udev-settle.service unit + * Fri Mar 16 2012 Bill Nottingham - 9.37-1 - Add support for firewalld zones (#802415, from ) From 8aa7444ea188e07d8ab9cfcafff564a25ea533e4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 29 Jun 2012 15:42:00 -0400 Subject: [PATCH 079/209] 9.38-1 --- .gitignore | 2 +- initscripts.spec | 55 +++++++++++++++++++----------------------------- sources | 2 +- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 6aa8229..e5962dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.37.tar.bz2 +/initscripts-9.38.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 7abbb47..e5d34ba 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,24 +4,24 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.37 +Version: 9.38 # 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 -Requires: mingetty, /bin/awk, /bin/sed, coreutils +Requires: /bin/awk, sed, coreutils Requires: /sbin/sysctl -Requires: /sbin/fuser, /bin/grep -Requires: /sbin/pidof, /sbin/blkid +Requires: /sbin/fuser, grep Requires: module-init-tools Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87-5 %if %{_with_upstart} Conflicts: upstart < 0.6.0 +Requires: mingetty %if ! %{_with_systemd} Requires: upstart-sysvinit %endif @@ -35,28 +35,14 @@ Requires: systemd-sysvinit %endif %if %{_with_sysvinit} Requires: SysVinit >= 2.85-38 +Requires: mingetty %endif -Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find +Requires: iproute, /sbin/arping, findutils Requires: /etc/system-release -Requires: /sbin/runuser Requires: udev >= 125-1 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9 -Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 -Conflicts: dhclient < 12:4.1.0-6 -Conflicts: tcsh < 6.13-5 -Conflicts: xorg-x11, glib2 < 2.11.1-2 -Conflicts: alsa-utils < 1.0.18 -Conflicts: plymouth < 0.7.0-0.2009.02.26 -Conflicts: s390utils < 2:1.8.2-11 -Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.65 -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 Requires(preun): /sbin/chkconfig @@ -97,11 +83,6 @@ make %install rm -rf $RPM_BUILD_ROOT make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install -# temporary fix for renamed unit file -sed -i 's/udev-settle.service/systemd-udev-settle.service/' \ - $RPM_BUILD_ROOT/lib/systemd/system/fedora-wait-storage.service > /dev/null 2>&1 || : -sed -i 's/udev.service/systemd-udev.service/'\ - $RPM_BUILD_ROOT/lib/systemd/system/fedora-wait-storage.service > /dev/null 2>&1 || : %find_lang %{name} @@ -263,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT %exclude /etc/rc.d/init.d/reboot %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 +/usr/lib/sysctl.d/00-system.conf %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig @@ -304,6 +285,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /etc/tmpfiles.d /etc/tmpfiles.d/initscripts.conf +%dir /usr/libexec/initscripts/legacy-actions %files legacy %defattr(-,root,root) @@ -331,8 +313,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Tue May 29 2012 Kay Sievers - 9.37-2 -- temporary fix for renamed systemd-udev-settle.service unit +* Fri Jun 29 2012 Bill Nottingham - 9.38-1 +- assorted documentation cleanups +- typo, spelling, licenese clean up () +- service: add support for legacy custom actions packaged in + /usr/libexec/initscripts/legacy-actions/