From 3006d2d8b3f60437c6218fecfc18f6084b044b87 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Tue, 18 Sep 2012 16:25:09 -0700
Subject: Copy command line files prior to pivot

We need these after the pivot and we can't get to them without copying
them into /run ourselves.
---
 dracut/Makefile.am              | 1 +
 dracut/anaconda-copy-cmdline.sh | 5 +++++
 dracut/module-setup.sh          | 1 +
 3 files changed, 7 insertions(+)
 create mode 100755 dracut/anaconda-copy-cmdline.sh

diff --git a/dracut/Makefile.am b/dracut/Makefile.am
index 8c56bf3eb..cb38e759c 100644
--- a/dracut/Makefile.am
+++ b/dracut/Makefile.am
@@ -33,6 +33,7 @@ dist_dracut_SCRIPTS = module-setup.sh \
 		      anaconda-netroot.sh \
 		      anaconda-diskroot \
 		      anaconda-copy-ks.sh \
+		      anaconda-copy-cmdline.sh \
 		      fetch-kickstart-net.sh \
 		      fetch-kickstart-disk \
 		      fetch-updates-disk \
diff --git a/dracut/anaconda-copy-cmdline.sh b/dracut/anaconda-copy-cmdline.sh
new file mode 100755
index 000000000..26aa3407b
--- /dev/null
+++ b/dracut/anaconda-copy-cmdline.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Copy over cmdline(.d) files from the initrd to /run before pivot
+mkdir -p /run/install/cmdline.d
+cp /etc/cmdline.d/* /run/install/cmdline.d/
+cp /etc/cmdline /run/install/
diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh
index 7705f1b4c..be2bd7103 100755
--- a/dracut/module-setup.sh
+++ b/dracut/module-setup.sh
@@ -30,6 +30,7 @@ install() {
     inst_hook initqueue/online 80 "$moddir/anaconda-netroot.sh"
     inst "$moddir/anaconda-diskroot" "/sbin/anaconda-diskroot"
     inst_hook pre-pivot 99 "$moddir/anaconda-copy-ks.sh"
+    inst_hook pre-pivot 99 "$moddir/anaconda-copy-cmdline.sh"
     # kickstart parsing, WOOOO
     inst_hook initqueue/online 10 "$moddir/fetch-kickstart-net.sh"
     inst "$moddir/fetch-kickstart-disk" "/sbin/fetch-kickstart-disk"
-- 
cgit