remount-rootfs.service got renamed to systemd-remount-fs.service

.gitignore

@@ -1 +1,2 @@
-/initscripts-9.42.tar.bz2
+/initscripts-9.42.1.tar.bz2
+/initscripts-9.42.2.tar.bz2

0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch

@@ -1,40 +0,0 @@
-From a1f80c69c76070e33bd2c0228738115f2c9c1473 Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka@redhat.com>
-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
-

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 <harald@redhat.com>
+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
+

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?= <vpavlin@redhat.com>
+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
+

d7cc6f6.patch

@@ -1,19 +0,0 @@
-commit d7cc6f6b94ee125ec3642368493766d38992af10 (HEAD, origin/master, origin/HEAD, master)
-Author: Bill Nottingham <notting@redhat.com>
-Date:   Mon Oct 8 16:20:56 2012 -0400
-
-    Don't pass -F to fixfiles (#863662, <dwalsh@redhat.com>)
-
-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

initscripts.spec

@@ -1,12 +1,14 @@
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.42
+Version: 9.42.2
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1%{?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
@@ -50,6 +52,8 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 make
@@ -173,7 +177,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
@@ -206,6 +209,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
@@ -214,6 +218,35 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Mar 15 2013 Václav Pavlín <vpavlin@redhat.com> - 9.42.2-3
+- remount-rootfs.service got renamed to systemd-remount-fs.service
+
+* Wed Mar 13 2013 Václav Pavlín <vpavlin@redhat.com> - 9.42.2-2
+- remove parameter -u from multipath call in fedora-storage-init (#908275)
+
+* Wed Feb 20 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 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 <notting@redhat.com> - 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)
+- fedora-storage-init: change lvm command line. (#873565)
+- remove fedora-wait-storage (#870544)
+
 * Wed Oct 31 2012 Bill Nottingham <notting@redhat.com> - 9.42-1
 - Halloween release!
 - add a default /etc/sysctl.conf that describes how to change values, and where the defaults now live. (#760254)

sources

@@ -1 +1 @@
-d5bde672cc94973cd8af8ac0354dbe8f  initscripts-9.42.tar.bz2
+9937bcd5ae144e3e19f2938f56bda940  initscripts-9.42.2.tar.bz2