From b8229bcfc458b73be58a82fdde32d620cd936263 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 27 Apr 2011 15:35:04 -0400 Subject: [PATCH 001/151] Fix 05-netfs for systemd. --- 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch | 18 ++++++++++++++++++ initscripts.spec | 7 +++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch diff --git a/046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch b/046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch new file mode 100644 index 0000000..e0daa29 --- /dev/null +++ b/046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch @@ -0,0 +1,18 @@ +commit 046a3ba411cc66eefcfe7d9a598e7960784e18e9 +Author: Bill Nottingham +Date: Wed Apr 27 15:31:11 2011 -0400 + + Don't redirect to systemctl, as 'start' in that case won't try to start it again. + +diff --git a/NetworkManager/dispatcher.d/05-netfs b/NetworkManager/dispatcher.d/05-netfs +index 655c87a..bd55846 100755 +--- a/NetworkManager/dispatcher.d/05-netfs ++++ b/NetworkManager/dispatcher.d/05-netfs +@@ -1,6 +1,7 @@ + #!/bin/sh + + export LC_ALL=C ++export SYSTEMCTL_SKIP_REDIRECT=1 + + if [ "$2" = "down" ]; then + /sbin/ip route ls | grep -q ^default || { diff --git a/initscripts.spec b/initscripts.spec index 858afd1..35eb817 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,7 +8,7 @@ Version: 9.30 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -59,6 +59,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch %description The initscripts package contains the basic system scripts used to boot @@ -88,6 +89,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 %build make @@ -314,7 +316,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Apr 27 2011 Bill Nottingham - 9.30-1 +* Wed Apr 27 2011 Bill Nottingham - 9.30-2 - ifup-eth: handle IPADDRx correctly for static addresses (#697838) - systemd: fix storage setup service after cryptsetup.target (#699918) - prefdm: tweak how plymouth is quit in the gdm/kdm case () @@ -323,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT - network-functions: fix IPADDRx index handling () - ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, ) - ifup-eth: ensure bond exists before bringing up slaves (#694501) +- 05-netfs: fix for systemd * Wed Apr 06 2011 Bill Nottingham - 9.29-1 - systemd: add a storage setup service after cryptsetup.target (#692198) From 4c3a9506dd6cd332eb895362a29392db78c7a667 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 21 Jun 2011 15:45:28 -0400 Subject: [PATCH 002/151] 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 003/151] 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 004/151] 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 005/151] 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 006/151] 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 6de3d3e770a708d4a07fa514a3c1250ed95bef79 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 16:39:57 -0400 Subject: [PATCH 007/151] 9.30.1-1 --- .gitignore | 2 +- initscripts.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bed8bc2..986b73b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.30.tar.bz2 +/initscripts-9.30.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 35eb817..ec7bab5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,11 +4,11 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.30 +Version: 9.30.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -59,7 +59,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: 046a3ba411cc66eefcfe7d9a598e7960784e18e9.patch %description The initscripts package contains the basic system scripts used to boot @@ -89,7 +88,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 %build make @@ -247,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT /etc/rc.d/init.d/* %exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/reboot +%exclude /etc/rc.d/rc[0-9].d/*single %exclude /etc/rc.d/init.d/single %config(noreplace) /etc/rc.d/rc.local %config(noreplace) /etc/sysctl.conf @@ -316,7 +315,17 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Apr 27 2011 Bill Nottingham - 9.30-2 +* Wed Oct 12 2011 Bill Nottingham - 9.30.1-1 +- netconsole: only use the first ARP response (#744309, ) +- assorted: plymouth lives in /bin (#702814) +- ifdown-eth: fix dhclient pid file for IPv6 (#729292, ) +- console_*: add freescale ttymx ports (#728730, ) +- rwtab: update for systemd (#704783) +- lang.csh/debug.csh: fix character classes +- ifup-aliases: if IPv6 is configured on the alias, configure it. (#583409) +- ifup-eth: ensure DHCP_HOSTNAME is a short hostname, seed it from HOSTNAME if needed. (#697877) + +* Wed Apr 27 2011 Bill Nottingham - 9.30-1 - ifup-eth: handle IPADDRx correctly for static addresses (#697838) - systemd: fix storage setup service after cryptsetup.target (#699918) - prefdm: tweak how plymouth is quit in the gdm/kdm case () @@ -325,7 +334,6 @@ rm -rf $RPM_BUILD_ROOT - network-functions: fix IPADDRx index handling () - ifup/down-eth: properly handle apr_ip_target, when used with module options (#604669, ) - ifup-eth: ensure bond exists before bringing up slaves (#694501) -- 05-netfs: fix for systemd * Wed Apr 06 2011 Bill Nottingham - 9.29-1 - systemd: add a storage setup service after cryptsetup.target (#692198) diff --git a/sources b/sources index a6e7960..7d11e8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -504d559c387e9d81101a7422fa933820 initscripts-9.30.tar.bz2 +398db4f62acdaec5cd18e1ac2b6ebca4 initscripts-9.30.1.tar.bz2 From 3e01f149294d0ad93707f16954289d3b4c275bd6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Oct 2011 16:53:52 -0400 Subject: [PATCH 008/151] 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 009/151] 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 010/151] 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 011/151] 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 012/151] 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 013/151] 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 014/151] - 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 015/151] 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 016/151] 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 017/151] 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 018/151] 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 019/151] 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 020/151] 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 021/151] 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/