[initscripts/f18] Add some patches from F18 branch in upstream git.

[Bill Nottingham]

commit 68255a4e5ede4a2666922c1bb098f052ee3e106d
Author: Bill Nottingham <notting at redhat.com>
Date:   Tue Nov 6 14:26:41 2012 -0500

    Add some patches from F18 branch in upstream git.

 8b18565.patch    |   17 +++++++++++++++
 fb580ac.patch    |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 initscripts.spec |   10 ++++++++-
 3 files changed, 84 insertions(+), 1 deletions(-)
---
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 <notting at redhat.com>
+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 <notting at redhat.com>
+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 <notting at redhat.com> - 9.42-1.1
+- fedora-storage-init: change lvm command line. (#873565)
+- remove fedora-wait-storage (#870544)
+
 * Wed Oct 31 2012 Bill Nottingham <notting at 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)