From 68255a4e5ede4a2666922c1bb098f052ee3e106d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 6 Nov 2012 14:26:41 -0500 Subject: [PATCH 1/7] Add some patches from F18 branch in upstream git. --- 8b18565.patch | 17 ++++++++++++++ fb580ac.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ initscripts.spec | 10 ++++++++- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 8b18565.patch create mode 100644 fb580ac.patch diff --git a/8b18565.patch b/8b18565.patch new file mode 100644 index 0000000..f646412 --- /dev/null +++ b/8b18565.patch @@ -0,0 +1,17 @@ +commit 8b18565ab2aafd5ffcf504a357ae98cb5a612fdd (HEAD, F18-branch) +Author: Bill Nottingham +Date: Tue Nov 6 14:16:56 2012 -0500 + + Change lvm command line. (#873565) + +diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init +index 565d811..41ba700 100755 +--- a/systemd/fedora-storage-init ++++ b/systemd/fedora-storage-init +@@ -37,5 +37,5 @@ fi + [ -r /proc/mdstat ] && [ -r /dev/md/md-device-map ] && /sbin/mdadm -IRs + + if [ -x /sbin/lvm ]; then +- action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit ++ action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a ay --sysinit + fi diff --git a/fb580ac.patch b/fb580ac.patch new file mode 100644 index 0000000..3368483 --- /dev/null +++ b/fb580ac.patch @@ -0,0 +1,58 @@ +commit fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c (HEAD, F18-branch) +Author: Bill Nottingham +Date: Tue Nov 6 14:23:17 2012 -0500 + + Drop fedora-wait-storage since scsi_wait_scan no longer exists ... move udev-settle requirements to fedora-storage-init. (#870544) + +diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service +index 69ad089..edd6d0c 100644 +--- a/systemd/system/fedora-storage-init-late.service ++++ b/systemd/system/fedora-storage-init-late.service +@@ -4,7 +4,6 @@ DefaultDependencies=no + Conflicts=shutdown.target + After=cryptsetup.target fedora-storage-init.service + Before=local-fs.target shutdown.target +-Wants=fedora-wait-storage.service + ConditionFileIsExecutable=|/sbin/lvm + ConditionFileIsExecutable=|/sbin/dmraid + ConditionPathExists=|/etc/multipath.conf +diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service +index 6d8e39f..bb559d7 100644 +--- a/systemd/system/fedora-storage-init.service ++++ b/systemd/system/fedora-storage-init.service +@@ -2,9 +2,9 @@ + Description=Initialize storage subsystems (RAID, LVM, etc.) + DefaultDependencies=no + Conflicts=shutdown.target +-After=fedora-wait-storage.service ++After=systemd-udev-settle.service + Before=local-fs.target shutdown.target +-Wants=fedora-wait-storage.service ++Wants=systemd-udev-settle.service + ConditionFileIsExecutable=|/sbin/lvm + ConditionFileIsExecutable=|/sbin/dmraid + ConditionPathExists=|/etc/multipath.conf +diff --git a/systemd/system/fedora-wait-storage.service b/systemd/system/fedora-wait-storage.service +deleted file mode 100644 +index 9d3b6ae..0000000 +--- a/systemd/system/fedora-wait-storage.service ++++ /dev/null +@@ -1,18 +0,0 @@ +-[Unit] +-Description=Wait for storage scan +-DefaultDependencies=no +-Conflicts=shutdown.target +-After=systemd-udev-settle.service +-Before=local-fs.target shutdown.target +-Wants=systemd-udev-settle.service +- +-[Service] +-ExecStart=-/sbin/rmmod scsi_wait_scan +-ExecStart=-/sbin/modprobe scsi_wait_scan +-ExecStart=-/sbin/rmmod scsi_wait_scan +-Type=oneshot +-TimeoutSec=0 +-RemainAfterExit=yes +-StandardInput=null +-StandardOutput=null +-StandardError=null diff --git a/initscripts.spec b/initscripts.spec index 675debc..0c495b7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Version: 9.42 # 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -30,6 +30,8 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: 8b18565.patch +Patch1: fb580ac.patch %description The initscripts package contains the basic system scripts used to boot @@ -50,6 +52,8 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build make @@ -214,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Nov 6 2012 Bill Nottingham - 9.42-1.1 +- fedora-storage-init: change lvm command line. (#873565) +- remove fedora-wait-storage (#870544) + * Wed Oct 31 2012 Bill Nottingham - 9.42-1 - Halloween release! - add a default /etc/sysctl.conf that describes how to change values, and where the defaults now live. (#760254) From 96da04f5003566a7b9c2a418dc15a8efd2cb8df1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 12 Nov 2012 16:37:32 -0500 Subject: [PATCH 2/7] fix wireless device detection for kernel 3.6 (#875328) --- 6548420.patch | 24 ++++++++++++++++++++++++ initscripts.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 6548420.patch diff --git a/6548420.patch b/6548420.patch new file mode 100644 index 0000000..499a858 --- /dev/null +++ b/6548420.patch @@ -0,0 +1,24 @@ +commit 6548420e7155949e703d09519e54e364878f67bd (HEAD, origin/F18-branch, F18-branch) +Author: Bill Nottingham +Date: Mon Nov 12 16:35:23 2012 -0500 + + Revert "Use sysfs rather than iwconfig for wireless check" + + This reverts commit af401fb40f6dd5139e8468dfe1bd3dafe40e8e93. + upstream removed sysfs wireless. How nice. + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 5b2f30a..0b5b11d 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -418,7 +418,9 @@ add_default_route () + + is_wireless_device () + { +- [ -d "/sys/class/net/$1/wireless" ] ++ [ -x /sbin/iwconfig ] || return 1 ++ LC_ALL=C iwconfig $1 2>&1 | grep -q "no wireless extensions" || return 0 ++ return 1 + } + + install_bonding_driver () diff --git a/initscripts.spec b/initscripts.spec index 0c495b7..3939c69 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Version: 9.42 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist}.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 @@ -32,6 +32,7 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Patch0: 8b18565.patch Patch1: fb580ac.patch +Patch2: 6548420.patch %description The initscripts package contains the basic system scripts used to boot @@ -54,6 +55,7 @@ Currently, this consists of various memory checking code. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make @@ -218,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Nov 12 2012 Bill Nottingham - 9.42-1.2 +- fix wireless device detection for kernel 3.6 (#875328) + * Tue Nov 6 2012 Bill Nottingham - 9.42-1.1 - fedora-storage-init: change lvm command line. (#873565) - remove fedora-wait-storage (#870544) From ad868b9a276f3efb83dfcc4de108a3594f20f850 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 7 Dec 2012 16:07:06 -0500 Subject: [PATCH 3/7] Roll in some more bugfixes into an upstream point release. --- .gitignore | 1 + 6548420.patch | 24 -------------------- 8b18565.patch | 17 -------------- fb580ac.patch | 58 ------------------------------------------------ initscripts.spec | 18 ++++++--------- sources | 1 + 6 files changed, 9 insertions(+), 110 deletions(-) delete mode 100644 6548420.patch delete mode 100644 8b18565.patch delete mode 100644 fb580ac.patch diff --git a/.gitignore b/.gitignore index 3f4cb25..0656060 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.42.tar.bz2 +/initscripts-9.42.1.tar.bz2 diff --git a/6548420.patch b/6548420.patch deleted file mode 100644 index 499a858..0000000 --- a/6548420.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 6548420e7155949e703d09519e54e364878f67bd (HEAD, origin/F18-branch, F18-branch) -Author: Bill Nottingham -Date: Mon Nov 12 16:35:23 2012 -0500 - - Revert "Use sysfs rather than iwconfig for wireless check" - - This reverts commit af401fb40f6dd5139e8468dfe1bd3dafe40e8e93. - upstream removed sysfs wireless. How nice. - -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 5b2f30a..0b5b11d 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -418,7 +418,9 @@ add_default_route () - - is_wireless_device () - { -- [ -d "/sys/class/net/$1/wireless" ] -+ [ -x /sbin/iwconfig ] || return 1 -+ LC_ALL=C iwconfig $1 2>&1 | grep -q "no wireless extensions" || return 0 -+ return 1 - } - - install_bonding_driver () diff --git a/8b18565.patch b/8b18565.patch deleted file mode 100644 index f646412..0000000 --- a/8b18565.patch +++ /dev/null @@ -1,17 +0,0 @@ -commit 8b18565ab2aafd5ffcf504a357ae98cb5a612fdd (HEAD, F18-branch) -Author: Bill Nottingham -Date: Tue Nov 6 14:16:56 2012 -0500 - - Change lvm command line. (#873565) - -diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init -index 565d811..41ba700 100755 ---- a/systemd/fedora-storage-init -+++ b/systemd/fedora-storage-init -@@ -37,5 +37,5 @@ fi - [ -r /proc/mdstat ] && [ -r /dev/md/md-device-map ] && /sbin/mdadm -IRs - - if [ -x /sbin/lvm ]; then -- action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit -+ action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a ay --sysinit - fi diff --git a/fb580ac.patch b/fb580ac.patch deleted file mode 100644 index 3368483..0000000 --- a/fb580ac.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c (HEAD, F18-branch) -Author: Bill Nottingham -Date: Tue Nov 6 14:23:17 2012 -0500 - - Drop fedora-wait-storage since scsi_wait_scan no longer exists ... move udev-settle requirements to fedora-storage-init. (#870544) - -diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service -index 69ad089..edd6d0c 100644 ---- a/systemd/system/fedora-storage-init-late.service -+++ b/systemd/system/fedora-storage-init-late.service -@@ -4,7 +4,6 @@ DefaultDependencies=no - Conflicts=shutdown.target - After=cryptsetup.target fedora-storage-init.service - Before=local-fs.target shutdown.target --Wants=fedora-wait-storage.service - ConditionFileIsExecutable=|/sbin/lvm - ConditionFileIsExecutable=|/sbin/dmraid - ConditionPathExists=|/etc/multipath.conf -diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service -index 6d8e39f..bb559d7 100644 ---- a/systemd/system/fedora-storage-init.service -+++ b/systemd/system/fedora-storage-init.service -@@ -2,9 +2,9 @@ - Description=Initialize storage subsystems (RAID, LVM, etc.) - DefaultDependencies=no - Conflicts=shutdown.target --After=fedora-wait-storage.service -+After=systemd-udev-settle.service - Before=local-fs.target shutdown.target --Wants=fedora-wait-storage.service -+Wants=systemd-udev-settle.service - ConditionFileIsExecutable=|/sbin/lvm - ConditionFileIsExecutable=|/sbin/dmraid - ConditionPathExists=|/etc/multipath.conf -diff --git a/systemd/system/fedora-wait-storage.service b/systemd/system/fedora-wait-storage.service -deleted file mode 100644 -index 9d3b6ae..0000000 ---- a/systemd/system/fedora-wait-storage.service -+++ /dev/null -@@ -1,18 +0,0 @@ --[Unit] --Description=Wait for storage scan --DefaultDependencies=no --Conflicts=shutdown.target --After=systemd-udev-settle.service --Before=local-fs.target shutdown.target --Wants=systemd-udev-settle.service -- --[Service] --ExecStart=-/sbin/rmmod scsi_wait_scan --ExecStart=-/sbin/modprobe scsi_wait_scan --ExecStart=-/sbin/rmmod scsi_wait_scan --Type=oneshot --TimeoutSec=0 --RemainAfterExit=yes --StandardInput=null --StandardOutput=null --StandardError=null diff --git a/initscripts.spec b/initscripts.spec index 3939c69..d99a80e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,10 +1,10 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.42 +Version: 9.42.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.2 +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 @@ -30,9 +30,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: 8b18565.patch -Patch1: fb580ac.patch -Patch2: 6548420.patch %description The initscripts package contains the basic system scripts used to boot @@ -53,9 +50,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build make @@ -220,10 +214,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Nov 12 2012 Bill Nottingham - 9.42-1.2 +* Fri Dec 7 2012 Bill Nottingham - 9.42.1-1 +- 60-net.rules: explicitly set the interface name (#870859) +- ifup-eth: set firewall zone before ifup-ipv6 for DHCPv6 (#802415) +- migrate to /etc/locale.conf, /etc/vconsole.conf (#881923) +- rename_device: fix bogus locking - fix wireless device detection for kernel 3.6 (#875328) - -* Tue Nov 6 2012 Bill Nottingham - 9.42-1.1 - fedora-storage-init: change lvm command line. (#873565) - remove fedora-wait-storage (#870544) diff --git a/sources b/sources index 6d7eb18..20ca2a2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ d5bde672cc94973cd8af8ac0354dbe8f initscripts-9.42.tar.bz2 +43b416b9deeef09f917b7e1304fa6af1 initscripts-9.42.1.tar.bz2 From 6c3e63336c1d50d4ef23bac8b779ba7e4047cce9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 7 Dec 2012 16:23:23 -0500 Subject: [PATCH 4/7] Fix the build. --- .gitignore | 1 - 65173d7.patch | 30 ++++++++++++++++++++++++++++++ initscripts.spec | 3 ++- sources | 1 - 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 65173d7.patch diff --git a/.gitignore b/.gitignore index 0656060..2c4360a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/initscripts-9.42.tar.bz2 /initscripts-9.42.1.tar.bz2 diff --git a/65173d7.patch b/65173d7.patch new file mode 100644 index 0000000..90c4652 --- /dev/null +++ b/65173d7.patch @@ -0,0 +1,30 @@ +commit 65173d72f1a662a8596aa0e14232556ba40e452f (HEAD, origin/master, origin/HEAD, master) +Author: Bill Nottingham +Date: Fri Dec 7 16:21:59 2012 -0500 + + Fix build. + +diff --git a/Makefile b/Makefile +index 1c6bce8..c6fc7a0 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,6 +22,7 @@ install: + install -m644 adjtime $(ROOT)/etc + install -m644 inittab $(ROOT)/etc + install -m644 rwtab statetab networks $(ROOT)/etc ++ install -m755 service $(ROOT)/sbin + install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d + install -m644 term256.csh term256.sh $(ROOT)/etc/profile.d + install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d +diff --git a/initscripts.spec b/initscripts.spec +index ce34c7f..c7f3a1c 100644 +--- a/initscripts.spec ++++ b/initscripts.spec +@@ -175,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT + %exclude /etc/profile.d/debug* + /etc/profile.d/* + /usr/sbin/sys-unconfig +-/sbin/setsysfont + /bin/ipcalc + /bin/usleep + %attr(4755,root,root) /usr/sbin/usernetctl diff --git a/initscripts.spec b/initscripts.spec index d99a80e..52fb13a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -30,6 +30,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch1: 65173d7.patch %description The initscripts package contains the basic system scripts used to boot @@ -50,6 +51,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch1 -p1 %build make @@ -173,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig -/sbin/setsysfont /bin/ipcalc /bin/usleep %attr(4755,root,root) /usr/sbin/usernetctl diff --git a/sources b/sources index 20ca2a2..c9f076e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d5bde672cc94973cd8af8ac0354dbe8f initscripts-9.42.tar.bz2 43b416b9deeef09f917b7e1304fa6af1 initscripts-9.42.1.tar.bz2 From 30667921454f197dbad8b937c33b8f44d6ee8402 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 20 Feb 2013 16:02:00 +0100 Subject: [PATCH 5/7] 9.42.2-1 --- .gitignore | 1 + ...irewall-cmd-in-ifup-post-ifdown-post.patch | 40 ------------------- 65173d7.patch | 30 -------------- d7cc6f6.patch | 19 --------- initscripts.spec | 19 +++++++-- sources | 2 +- 6 files changed, 18 insertions(+), 93 deletions(-) delete mode 100644 0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch delete mode 100644 65173d7.patch delete mode 100644 d7cc6f6.patch diff --git a/.gitignore b/.gitignore index 2c4360a..fb72605 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.42.1.tar.bz2 +/initscripts-9.42.2.tar.bz2 diff --git a/0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch b/0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch deleted file mode 100644 index 42ac0a9..0000000 --- a/0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a1f80c69c76070e33bd2c0228738115f2c9c1473 Mon Sep 17 00:00:00 2001 -From: Jiri Popelka -Date: Fri, 5 Oct 2012 16:57:32 +0200 -Subject: [PATCH] Fix calling of firewall-cmd in ifup-post/ifdown-post. - -firewall-cmd has been using combined longopts since 0.2.6 ---- - sysconfig/network-scripts/ifdown-post | 2 +- - sysconfig/network-scripts/ifup-post | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post -index 68354de..bcf4765 100755 ---- a/sysconfig/network-scripts/ifdown-post -+++ b/sysconfig/network-scripts/ifdown-post -@@ -48,7 +48,7 @@ fi - - # Inform firewall - if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then -- /usr/bin/firewall-cmd --remove --interface="${DEVICE}" > /dev/null 2>&1 -+ /usr/bin/firewall-cmd --remove-interface="${DEVICE}" > /dev/null 2>&1 - fi - - # Notify programs that have requested notification -diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post -index 1ebb9c2..ca14acf 100755 ---- a/sysconfig/network-scripts/ifup-post -+++ b/sysconfig/network-scripts/ifup-post -@@ -95,7 +95,7 @@ fi - - # Inform firewall which network zone (empty means default) this interface belongs to - if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then -- /usr/bin/firewall-cmd --zone="${ZONE}" --change --interface="${DEVICE}" > /dev/null 2>&1 -+ /usr/bin/firewall-cmd --zone="${ZONE}" --change-interface="${DEVICE}" > /dev/null 2>&1 - fi - - # Notify programs that have requested notification --- -1.7.11.4 - diff --git a/65173d7.patch b/65173d7.patch deleted file mode 100644 index 90c4652..0000000 --- a/65173d7.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 65173d72f1a662a8596aa0e14232556ba40e452f (HEAD, origin/master, origin/HEAD, master) -Author: Bill Nottingham -Date: Fri Dec 7 16:21:59 2012 -0500 - - Fix build. - -diff --git a/Makefile b/Makefile -index 1c6bce8..c6fc7a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -22,6 +22,7 @@ install: - install -m644 adjtime $(ROOT)/etc - install -m644 inittab $(ROOT)/etc - install -m644 rwtab statetab networks $(ROOT)/etc -+ install -m755 service $(ROOT)/sbin - install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d - install -m644 term256.csh term256.sh $(ROOT)/etc/profile.d - install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d -diff --git a/initscripts.spec b/initscripts.spec -index ce34c7f..c7f3a1c 100644 ---- a/initscripts.spec -+++ b/initscripts.spec -@@ -175,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT - %exclude /etc/profile.d/debug* - /etc/profile.d/* - /usr/sbin/sys-unconfig --/sbin/setsysfont - /bin/ipcalc - /bin/usleep - %attr(4755,root,root) /usr/sbin/usernetctl diff --git a/d7cc6f6.patch b/d7cc6f6.patch deleted file mode 100644 index 271d230..0000000 --- a/d7cc6f6.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit d7cc6f6b94ee125ec3642368493766d38992af10 (HEAD, origin/master, origin/HEAD, master) -Author: Bill Nottingham -Date: Mon Oct 8 16:20:56 2012 -0400 - - Don't pass -F to fixfiles (#863662, ) - -diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel -index 61dc551..689908a 100755 ---- a/systemd/fedora-autorelabel -+++ b/systemd/fedora-autorelabel -@@ -27,7 +27,7 @@ relabel_selinux() { - echo $"*** Relabeling could take a very long time, depending on file" - echo $"*** system size and speed of hard drives." - -- /sbin/fixfiles -F restore > /dev/null 2>&1 -+ /sbin/fixfiles restore > /dev/null 2>&1 - fi - rm -f /.autorelabel - systemctl --force reboot diff --git a/initscripts.spec b/initscripts.spec index 52fb13a..cc0d226 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.42.1 +Version: 9.42.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -30,7 +30,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch1: 65173d7.patch %description The initscripts package contains the basic system scripts used to boot @@ -51,7 +50,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch1 -p1 %build make @@ -207,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /lib/tmpfiles.d /lib/tmpfiles.d/initscripts.conf +%dir /usr/libexec/initscripts %dir /usr/libexec/initscripts/legacy-actions %files -n debugmode @@ -215,6 +214,20 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Feb 20 2013 Lukáš Nykrýn - 9.42.2-1 +- limit udev rule for network renaming (#907365, mschmidt@redhat.com) +- fix path for arpwatch, seems to be in /var/lib on Fedora 18 +- fix the path for lvm cache, there is no file /etc/lvm/.cache ( but there is one /etc/lvm/cache ) +- fix path for dhcpd, is /var/lib/dhcpd since 2005 ( see 31cdb58df77 on the dhcp package git ) +- fix the patch for apache modules in rwtab, that are now in /var/cache/httpd +- remove no longer used directory ( at least in Fedora ), hald is deprecated, /var/tux cannot be found and xend seems to use a subdirectory of /var/lib/xen +- correct the path for puppet directory in /etc/rwtab, now use /var/lib/puppet by default +- Correctly detect Open vSwitch device types +- Clear DEVICE and TYPE variables before every iteration (#902463) +- Add /usr/libexec/initscripts to file list (#894475) +- Rename term256 to 256term (glob sort) (#849429) +- Readd missing shebang. (#885821) + * Fri Dec 7 2012 Bill Nottingham - 9.42.1-1 - 60-net.rules: explicitly set the interface name (#870859) - ifup-eth: set firewall zone before ifup-ipv6 for DHCPv6 (#802415) diff --git a/sources b/sources index c9f076e..7bc1eb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43b416b9deeef09f917b7e1304fa6af1 initscripts-9.42.1.tar.bz2 +9937bcd5ae144e3e19f2938f56bda940 initscripts-9.42.2.tar.bz2 From a5ee4ec49eec51e91c1f6bc3f1c1b8eb6b0919a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= Date: Wed, 13 Mar 2013 13:36:42 +0100 Subject: [PATCH 6/7] remove parameter -u from multipath call in fedora-storage-init (#908275) --- ...-u-from-multipath-call-in-fedora-sto.patch | 26 +++++++++++++++++++ initscripts.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-remove-parameter-u-from-multipath-call-in-fedora-sto.patch diff --git a/0001-remove-parameter-u-from-multipath-call-in-fedora-sto.patch b/0001-remove-parameter-u-from-multipath-call-in-fedora-sto.patch new file mode 100644 index 0000000..ea6f06d --- /dev/null +++ b/0001-remove-parameter-u-from-multipath-call-in-fedora-sto.patch @@ -0,0 +1,26 @@ +From a838e9f574ece312b3f3d837a390813c156faf6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= +Date: Wed, 13 Mar 2013 13:26:26 +0100 +Subject: [PATCH] remove parameter -u from multipath call in + fedora-storage-init (#908275) + +--- + systemd/fedora-storage-init | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init +index 41ba700..df4323d 100755 +--- a/systemd/fedora-storage-init ++++ b/systemd/fedora-storage-init +@@ -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 -u -v 0 ++ /sbin/multipath -v 0 + if [ -x /sbin/kpartx ]; then + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -u -a -p p" >/dev/null + fi +-- +1.8.1.4 + diff --git a/initscripts.spec b/initscripts.spec index cc0d226..930fc40 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,9 +4,10 @@ Version: 9.42.2 # 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: 0001-remove-parameter-u-from-multipath-call-in-fedora-sto.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Obsoletes: initscripts-legacy <= 9.39 Requires: /bin/awk, sed, coreutils @@ -50,6 +51,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0 -p1 %build make @@ -214,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Mar 13 2013 Václav Pavlín - 9.42.2-2 +- remove parameter -u from multipath call in fedora-storage-init (#908275) + * Wed Feb 20 2013 Lukáš Nykrýn - 9.42.2-1 - limit udev rule for network renaming (#907365, mschmidt@redhat.com) - fix path for arpwatch, seems to be in /var/lib on Fedora 18 From c4ff60d3b7fc5eebea85dd1284b6f4167007a3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= Date: Fri, 15 Mar 2013 14:56:32 +0100 Subject: [PATCH 7/7] remount-rootfs.service got renamed to systemd-remount-fs.service --- ...ervice-got-renamed-to-systemd-remoun.patch | 40 +++++++++++++++++++ initscripts.spec | 7 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-remount-rootfs.service-got-renamed-to-systemd-remoun.patch diff --git a/0001-remount-rootfs.service-got-renamed-to-systemd-remoun.patch b/0001-remount-rootfs.service-got-renamed-to-systemd-remoun.patch new file mode 100644 index 0000000..543e41f --- /dev/null +++ b/0001-remount-rootfs.service-got-renamed-to-systemd-remoun.patch @@ -0,0 +1,40 @@ +From 7ae0decf762beed8ff17c03fd203e78e3108b46b Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 12 Mar 2013 13:58:09 +0100 +Subject: [PATCH] remount-rootfs.service got renamed to + systemd-remount-fs.service + +--- + systemd/system/fedora-import-state.service | 2 +- + systemd/system/fedora-readonly.service | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/system/fedora-import-state.service b/systemd/system/fedora-import-state.service +index 00d3d06..7425fba 100644 +--- a/systemd/system/fedora-import-state.service ++++ b/systemd/system/fedora-import-state.service +@@ -5,7 +5,7 @@ ConditionPathIsReadWrite=/ + ConditionDirectoryNotEmpty=/run/initramfs/state + Conflicts=shutdown.target + Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service +-After=remount-rootfs.service ++After=systemd-remount-fs.service + + [Service] + ExecStart=/lib/systemd/fedora-import-state +diff --git a/systemd/system/fedora-readonly.service b/systemd/system/fedora-readonly.service +index 2a7db25..cc87979 100644 +--- a/systemd/system/fedora-readonly.service ++++ b/systemd/system/fedora-readonly.service +@@ -3,7 +3,7 @@ Description=Configure read-only root support + DefaultDependencies=no + Conflicts=shutdown.target + Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service local-fs.target +-After=remount-rootfs.service ++After=systemd-remount-fs.service + + [Service] + ExecStart=/lib/systemd/fedora-readonly +-- +1.8.1.4 + diff --git a/initscripts.spec b/initscripts.spec index 930fc40..bea627b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,10 +4,11 @@ Version: 9.42.2 # 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 Patch0: 0001-remove-parameter-u-from-multipath-call-in-fedora-sto.patch +Patch1: 0001-remount-rootfs.service-got-renamed-to-systemd-remoun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Obsoletes: initscripts-legacy <= 9.39 Requires: /bin/awk, sed, coreutils @@ -52,6 +53,7 @@ Currently, this consists of various memory checking code. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -216,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Mar 15 2013 Václav Pavlín - 9.42.2-3 +- remount-rootfs.service got renamed to systemd-remount-fs.service + * Wed Mar 13 2013 Václav Pavlín - 9.42.2-2 - remove parameter -u from multipath call in fedora-storage-init (#908275)