[dracut/f15/master] - fixed mkdir for /run Resolves: rhbz#699113 - fixed console reset after plymouth started Resolves:
Harald Hoyer
harald at fedoraproject.org
Wed May 4 12:12:54 UTC 2011
commit ecc2cf73d14ddc121c3dd8381d290ff1421feb6b
Author: Harald Hoyer <harald at redhat.com>
Date: Wed May 4 14:14:08 2011 +0200
- fixed mkdir for /run
Resolves: rhbz#699113
- fixed console reset after plymouth started
Resolves: rhbz#700971
...t-skip-zero-length-string-outfile-argumen.patch | 2 +-
...-simplify-kernel-version-argument-setting.patch | 2 +-
...3-dracut-source-reformat-with-line-breaks.patch | 2 +-
...dracut-functions-bashified-ret-ret-to-ret.patch | 2 +-
...oved-extra-char-in-Including-modules-done.patch | 2 +-
...lib-firmware-updates-to-default-firmware-.patch | 2 +-
...hcp-root.sh-s-initqueue-finished-initqueu.patch | 2 +-
...atch => 0008-Ensure-rpc_pipefs-is-mounted.patch | 2 +-
...nsplash-check-for-console_init-before-cal.patch | 2 +-
...patch => 0010-base-init-fix-cdrom-polling.patch | 2 +-
...cut-lib.sh-relax-getargbool-value-parsing.patch | 2 +-
...2-doc-s-init.log-run-initramfs-init.log-g.patch | 2 +-
...ase-init-fixed-compat-dev-.initramfs-copy.patch | 2 +-
...atch => 0014-fips-fixed-boot-dev-handling.patch | 2 +-
...e-run-plymouth-pid-instead-of-run-initram.patch | 2 +-
...ve-dmsquash-live-genrules.sh-fixed-udev-r.patch | 2 +-
...ase-dracut-lib.sh-changed-kmgs-log-levels.patch | 2 +-
...8-base-init-reset-PATH-after-the-run-move.patch | 2 +-
...acut-don-t-fail-on-empty-etc-ld.so.conf.d.patch | 2 +-
0020-mkdir-always-with-m-0755.patch | 279 ++++++++++++++++++++
...t-plymouth-use-systemd-vconsole-if-availa.patch | 82 ++++++
...systemd-vconsole-systemd-vconsole-setup-g.patch | 38 +++
...ot-use-console_init-shell-script-if-syste.patch | 92 +++++++
...nsplash-reset-tty-after-plymouth-messed-w.patch | 40 +++
dracut.spec | 58 +++--
25 files changed, 587 insertions(+), 40 deletions(-)
---
diff --git a/0003-dracut-don-t-skip-zero-length-string-outfile-argumen.patch b/0001-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
similarity index 93%
rename from 0003-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
rename to 0001-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
index c0a0d0c..8767536 100644
--- a/0003-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
+++ b/0001-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
@@ -1,4 +1,4 @@
-From dbf381f7fb369bd6336272847da882d8ef0e5a30 Mon Sep 17 00:00:00 2001
+From 763984005a97500fa4fac47b9b83e03c838017e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
Date: Tue, 29 Mar 2011 01:21:56 +0200
Subject: [PATCH] dracut: don't skip zero-length string outfile argument
diff --git a/0004-dracut-simplify-kernel-version-argument-setting.patch b/0002-dracut-simplify-kernel-version-argument-setting.patch
similarity index 93%
rename from 0004-dracut-simplify-kernel-version-argument-setting.patch
rename to 0002-dracut-simplify-kernel-version-argument-setting.patch
index 9d030bf..d343625 100644
--- a/0004-dracut-simplify-kernel-version-argument-setting.patch
+++ b/0002-dracut-simplify-kernel-version-argument-setting.patch
@@ -1,4 +1,4 @@
-From 8a5354a9a5264c67a84c4705c931c5f554d8d343 Mon Sep 17 00:00:00 2001
+From 88aa2210e4a548c63561271a1b349bb717662863 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 11:21:54 +0200
Subject: [PATCH] dracut: simplify $kernel version argument setting
diff --git a/0005-dracut-source-reformat-with-line-breaks.patch b/0003-dracut-source-reformat-with-line-breaks.patch
similarity index 92%
rename from 0005-dracut-source-reformat-with-line-breaks.patch
rename to 0003-dracut-source-reformat-with-line-breaks.patch
index c31094b..6bf4503 100644
--- a/0005-dracut-source-reformat-with-line-breaks.patch
+++ b/0003-dracut-source-reformat-with-line-breaks.patch
@@ -1,4 +1,4 @@
-From 2aad23443e995b99dd1477ed018c5ac472a06aea Mon Sep 17 00:00:00 2001
+From 188ceb139a2895c8e943dbfe623466796259773c Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 11:27:15 +0200
Subject: [PATCH] dracut: source reformat with line breaks
diff --git a/0006-dracut-functions-bashified-ret-ret-to-ret.patch b/0004-dracut-functions-bashified-ret-ret-to-ret.patch
similarity index 91%
rename from 0006-dracut-functions-bashified-ret-ret-to-ret.patch
rename to 0004-dracut-functions-bashified-ret-ret-to-ret.patch
index 037e9c6..65417db 100644
--- a/0006-dracut-functions-bashified-ret-ret-to-ret.patch
+++ b/0004-dracut-functions-bashified-ret-ret-to-ret.patch
@@ -1,4 +1,4 @@
-From a16ebfd56abfb02f28b72a74c68c24501e2a75d7 Mon Sep 17 00:00:00 2001
+From b8d2485c84ca7511906729a0420c9de0ba59d343 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 11:30:27 +0200
Subject: [PATCH] dracut-functions: bashified ret=ret+$? to ret+=$?
diff --git a/0007-dracut-removed-extra-char-in-Including-modules-done.patch b/0005-dracut-removed-extra-char-in-Including-modules-done.patch
similarity index 89%
rename from 0007-dracut-removed-extra-char-in-Including-modules-done.patch
rename to 0005-dracut-removed-extra-char-in-Including-modules-done.patch
index cf4e419..2623053 100644
--- a/0007-dracut-removed-extra-char-in-Including-modules-done.patch
+++ b/0005-dracut-removed-extra-char-in-Including-modules-done.patch
@@ -1,4 +1,4 @@
-From ea216a650ef738e324253f27b59d74e3d8aa6062 Mon Sep 17 00:00:00 2001
+From a41be01a50f70ce346dbca4ae0197eec9b353030 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 14:45:08 +0200
Subject: [PATCH] dracut: removed extra char in "Including modules done"
diff --git a/0008-dracut-add-lib-firmware-updates-to-default-firmware-.patch b/0006-dracut-add-lib-firmware-updates-to-default-firmware-.patch
similarity index 92%
rename from 0008-dracut-add-lib-firmware-updates-to-default-firmware-.patch
rename to 0006-dracut-add-lib-firmware-updates-to-default-firmware-.patch
index c54c916..201b205 100644
--- a/0008-dracut-add-lib-firmware-updates-to-default-firmware-.patch
+++ b/0006-dracut-add-lib-firmware-updates-to-default-firmware-.patch
@@ -1,4 +1,4 @@
-From 8bc650d9dc6dd50ea3b955d5068c2f805a5d1878 Mon Sep 17 00:00:00 2001
+From 44d3c5f189a7eed26a344403ff3183b302772daf Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 15:32:34 +0200
Subject: [PATCH] dracut: add "/lib/firmware/updates" to default firmware path
diff --git a/0009-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch b/0007-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
similarity index 92%
rename from 0009-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
rename to 0007-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
index ac20279..7c01133 100644
--- a/0009-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
+++ b/0007-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
@@ -1,4 +1,4 @@
-From 85323dcbb957e7fa3daebd3d5b2f9563ef379ca2 Mon Sep 17 00:00:00 2001
+From e77e82e12ebc5d33a6be8bdf8b35df6ad11e38c7 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 15:46:53 +0200
Subject: [PATCH] 40network/dhcp-root.sh: s#initqueue-finished#initqueue/finished#g
diff --git a/0010-Ensure-rpc_pipefs-is-mounted.patch b/0008-Ensure-rpc_pipefs-is-mounted.patch
similarity index 93%
rename from 0010-Ensure-rpc_pipefs-is-mounted.patch
rename to 0008-Ensure-rpc_pipefs-is-mounted.patch
index 68cac9c..1e0a1c1 100644
--- a/0010-Ensure-rpc_pipefs-is-mounted.patch
+++ b/0008-Ensure-rpc_pipefs-is-mounted.patch
@@ -1,4 +1,4 @@
-From c174aea07decb62d264b40301ee944ba50244438 Mon Sep 17 00:00:00 2001
+From 13af32a6b9309ee8dc195b89d5347ed1f7bd24ac Mon Sep 17 00:00:00 2001
From: Jon Ander Hernandez <jonan.h at gmail.com>
Date: Fri, 18 Feb 2011 12:24:06 +0100
Subject: [PATCH] Ensure rpc_pipefs is mounted
diff --git a/0011-plymouth-gensplash-check-for-console_init-before-cal.patch b/0009-plymouth-gensplash-check-for-console_init-before-cal.patch
similarity index 95%
rename from 0011-plymouth-gensplash-check-for-console_init-before-cal.patch
rename to 0009-plymouth-gensplash-check-for-console_init-before-cal.patch
index b169a52..561a681 100644
--- a/0011-plymouth-gensplash-check-for-console_init-before-cal.patch
+++ b/0009-plymouth-gensplash-check-for-console_init-before-cal.patch
@@ -1,4 +1,4 @@
-From 7931bf04204ab41d6e87890e172f2805718bb93a Mon Sep 17 00:00:00 2001
+From 353feb3a4d3067136d4c36e086fa71a9329bad95 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 29 Mar 2011 16:38:11 +0200
Subject: [PATCH] plymouth gensplash: check for console_init before calling it
diff --git a/0012-base-init-fix-cdrom-polling.patch b/0010-base-init-fix-cdrom-polling.patch
similarity index 93%
rename from 0012-base-init-fix-cdrom-polling.patch
rename to 0010-base-init-fix-cdrom-polling.patch
index 7d638d3..60decc5 100644
--- a/0012-base-init-fix-cdrom-polling.patch
+++ b/0010-base-init-fix-cdrom-polling.patch
@@ -1,4 +1,4 @@
-From e620bb01da5c957c311f336c2f963c9bd9f692c5 Mon Sep 17 00:00:00 2001
+From fa1508ddd8af5c9736ccd916fa507ab795d03568 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 30 Mar 2011 00:01:00 +0200
Subject: [PATCH] base/init: fix cdrom polling
diff --git a/0013-base-dracut-lib.sh-relax-getargbool-value-parsing.patch b/0011-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
similarity index 92%
rename from 0013-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
rename to 0011-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
index 1b33f7b..cde5418 100644
--- a/0013-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
+++ b/0011-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
@@ -1,4 +1,4 @@
-From 4ad453445a7c8695c774cbfd2f5bd863e47e78df Mon Sep 17 00:00:00 2001
+From d0128287a671f1a009b8062e3e9bfa877b36be8c Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 30 Mar 2011 01:45:17 +0200
Subject: [PATCH] base/dracut-lib.sh: relax getargbool value parsing
diff --git a/0014-doc-s-init.log-run-initramfs-init.log-g.patch b/0012-doc-s-init.log-run-initramfs-init.log-g.patch
similarity index 95%
rename from 0014-doc-s-init.log-run-initramfs-init.log-g.patch
rename to 0012-doc-s-init.log-run-initramfs-init.log-g.patch
index 02903a2..1f7d49e 100644
--- a/0014-doc-s-init.log-run-initramfs-init.log-g.patch
+++ b/0012-doc-s-init.log-run-initramfs-init.log-g.patch
@@ -1,4 +1,4 @@
-From 561d7f4d7c7f6245a45c0943c91518654284e457 Mon Sep 17 00:00:00 2001
+From f78d7fbc6dc5cb1054a4b2de45de4766f04ad103 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 30 Mar 2011 03:22:14 +0200
Subject: [PATCH] doc: s#/init.log#/run/initramfs/init.log#g
diff --git a/0015-base-init-fixed-compat-dev-.initramfs-copy.patch b/0013-base-init-fixed-compat-dev-.initramfs-copy.patch
similarity index 94%
rename from 0015-base-init-fixed-compat-dev-.initramfs-copy.patch
rename to 0013-base-init-fixed-compat-dev-.initramfs-copy.patch
index 043afd4..2beed72 100644
--- a/0015-base-init-fixed-compat-dev-.initramfs-copy.patch
+++ b/0013-base-init-fixed-compat-dev-.initramfs-copy.patch
@@ -1,4 +1,4 @@
-From 249f8b5bfc90d9a8ec542e870a527a08e1da7cc3 Mon Sep 17 00:00:00 2001
+From 3b365e72a58da6fae211a5a12e7f98d18d8671e2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 30 Mar 2011 03:23:37 +0200
Subject: [PATCH] base/init: fixed compat /dev/.initramfs copy
diff --git a/0016-fips-fixed-boot-dev-handling.patch b/0014-fips-fixed-boot-dev-handling.patch
similarity index 94%
rename from 0016-fips-fixed-boot-dev-handling.patch
rename to 0014-fips-fixed-boot-dev-handling.patch
index 1df7851..869f7ed 100644
--- a/0016-fips-fixed-boot-dev-handling.patch
+++ b/0014-fips-fixed-boot-dev-handling.patch
@@ -1,4 +1,4 @@
-From 01583ae4ad05519a78cf661ff1104cd9b2910aa7 Mon Sep 17 00:00:00 2001
+From 7175ded515cb859a11e6bb9fbffbae771dfbf3f6 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 30 Mar 2011 14:50:42 +0200
Subject: [PATCH] fips: fixed "boot=<dev>" handling
diff --git a/0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch b/0015-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
similarity index 94%
rename from 0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
rename to 0015-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
index 61fbb28..7426fdc 100644
--- a/0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
+++ b/0015-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
@@ -1,4 +1,4 @@
-From 8ee30d09a44601d54567d7d51c84b2d714dd8e0f Mon Sep 17 00:00:00 2001
+From 149037e0252d4c9f5d10c07a48aa62860de6ceea Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 30 Mar 2011 16:24:57 +0200
Subject: [PATCH] plymouth: use /run/plymouth/pid instead of /run/initramfs/plymouth
diff --git a/0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch b/0016-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
similarity index 93%
rename from 0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
rename to 0016-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
index f4b272f..6068f55 100644
--- a/0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
+++ b/0016-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
@@ -1,4 +1,4 @@
-From 98b108284cc62203d3f9cc392b287affdee35305 Mon Sep 17 00:00:00 2001
+From 5f66cdbbb0b0e7ad075504305dd4adaae60b9373 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 31 Mar 2011 08:24:15 +0200
Subject: [PATCH] dmsquash-live/dmsquash-live-genrules.sh: fixed udev rule location
diff --git a/0019-base-dracut-lib.sh-changed-kmgs-log-levels.patch b/0017-base-dracut-lib.sh-changed-kmgs-log-levels.patch
similarity index 95%
rename from 0019-base-dracut-lib.sh-changed-kmgs-log-levels.patch
rename to 0017-base-dracut-lib.sh-changed-kmgs-log-levels.patch
index 3e20aaf..b0598e9 100644
--- a/0019-base-dracut-lib.sh-changed-kmgs-log-levels.patch
+++ b/0017-base-dracut-lib.sh-changed-kmgs-log-levels.patch
@@ -1,4 +1,4 @@
-From 79471f365e5f276ac5463404fbe739ddb2e12465 Mon Sep 17 00:00:00 2001
+From e972af8bed585b75e689bf952f82d596077d68a1 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 31 Mar 2011 13:12:38 +0200
Subject: [PATCH] base/dracut-lib.sh: changed kmgs log levels
diff --git a/0020-base-init-reset-PATH-after-the-run-move.patch b/0018-base-init-reset-PATH-after-the-run-move.patch
similarity index 92%
rename from 0020-base-init-reset-PATH-after-the-run-move.patch
rename to 0018-base-init-reset-PATH-after-the-run-move.patch
index 3511dea..a193aa0 100644
--- a/0020-base-init-reset-PATH-after-the-run-move.patch
+++ b/0018-base-init-reset-PATH-after-the-run-move.patch
@@ -1,4 +1,4 @@
-From 985377435120ce2b2ba48c9236f3f788a5db822a Mon Sep 17 00:00:00 2001
+From b7690b2e60fd1c189d27b70fa2240cd62746fa0a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 31 Mar 2011 14:10:22 +0200
Subject: [PATCH] base/init: reset PATH after the /run move
diff --git a/0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch b/0019-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
similarity index 91%
rename from 0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
rename to 0019-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
index 0b16d25..dd21e51 100644
--- a/0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
+++ b/0019-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
@@ -1,4 +1,4 @@
-From 76353076c081ac51647214c5ce910aba027b25db Mon Sep 17 00:00:00 2001
+From c2b63ed8c670056a3675e0649badb1791c02ad8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
Date: Sat, 2 Apr 2011 00:45:44 +0200
Subject: [PATCH] dracut: don't fail on empty /etc/ld.so.conf.d/
diff --git a/0020-mkdir-always-with-m-0755.patch b/0020-mkdir-always-with-m-0755.patch
new file mode 100644
index 0000000..771f026
--- /dev/null
+++ b/0020-mkdir-always-with-m-0755.patch
@@ -0,0 +1,279 @@
+From d973b896cd9983f95efcccf900e26d398f406110 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 6 Apr 2011 09:22:21 +0200
+Subject: [PATCH] mkdir always with -m 0755
+
+---
+ modules.d/01fips/fips.sh | 2 +-
+ modules.d/01fips/module-setup.sh | 2 +-
+ modules.d/10rpmversion/module-setup.sh | 2 +-
+ modules.d/45ifcfg/write-ifcfg.sh | 6 +++---
+ modules.d/50plymouth/plymouth-populate-initrd | 4 ++--
+ modules.d/50plymouth/plymouth-pretrigger.sh | 2 +-
+ modules.d/90dmsquash-live/dmsquash-live-root | 18 +++++++++---------
+ modules.d/90lvm/lvm_scan.sh | 2 +-
+ modules.d/95dasd_mod/parse-dasd-mod.sh | 2 +-
+ modules.d/95fcoe/module-setup.sh | 2 +-
+ modules.d/95nfs/module-setup.sh | 6 +++---
+ modules.d/95nfs/nfsroot-cleanup.sh | 3 ++-
+ modules.d/98syslog/module-setup.sh | 2 +-
+ modules.d/99base/dracut-lib.sh | 4 ++--
+ 14 files changed, 29 insertions(+), 28 deletions(-)
+
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index 857c355..960e589 100755
+--- a/modules.d/01fips/fips.sh
++++ b/modules.d/01fips/fips.sh
+@@ -33,7 +33,7 @@ do_fips()
+
+ [ -e "$boot" ]
+
+- mkdir /boot
++ mkdir -m 0755 /boot
+ info "Mounting $boot as /boot"
+ mount -oro "$boot" /boot
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index cdcded6..23c550a 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -15,7 +15,7 @@ installkernel() {
+ FIPSMODULES="$FIPSMODULES des deflate ecb eseqiv hmac seqiv sha256 sha512"
+ FIPSMODULES="$FIPSMODULES cryptomgr crypto_null tcrypt"
+
+- mkdir -p "${initdir}/etc/modprobe.d"
++ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+
+ for mod in $FIPSMODULES; do
+ if instmods $mod; then
+diff --git a/modules.d/10rpmversion/module-setup.sh b/modules.d/10rpmversion/module-setup.sh
+index 60a8d89..2b32e27 100755
+--- a/modules.d/10rpmversion/module-setup.sh
++++ b/modules.d/10rpmversion/module-setup.sh
+@@ -17,7 +17,7 @@ install() {
+ else
+ if rpm -qf $(type -P $0) &>/dev/null; then
+ dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
+- mkdir -m 0755 -p $initdir/lib $initdir/lib/dracut
++ mkdir -m 0755 -p $initdir/lib/dracut
+ echo $dracut_rpm_version > $initdir/lib/dracut/$dracut_rpm_version
+ fi
+ fi
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
+index fe72dbe..fb88318 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -17,7 +17,7 @@ if [ -e /tmp/bridge.info ]; then
+ . /tmp/bridge.info
+ fi
+
+-mkdir -p /tmp/ifcfg/
++mkdir -m 0755 -p /tmp/ifcfg/
+
+ for netif in $IFACES ; do
+ # bridge?
+@@ -134,9 +134,9 @@ for netif in $IFACES ; do
+ done
+
+ # Pass network opts
+-mkdir -p /run/initramfs
++mkdir -m 0755 -p /run/initramfs
+ cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1
+-mkdir -p /run/initramfs/state/etc/sysconfig/network-scripts/
++mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts/
+ cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1
+ echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab
+ cp -a /tmp/ifcfg/* /run/initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1
+diff --git a/modules.d/50plymouth/plymouth-populate-initrd b/modules.d/50plymouth/plymouth-populate-initrd
+index 199cab0..28c225c 100755
+--- a/modules.d/50plymouth/plymouth-populate-initrd
++++ b/modules.d/50plymouth/plymouth-populate-initrd
+@@ -9,7 +9,7 @@ dracut_install /bin/plymouth \
+ "${PLYMOUTH_LOGO_FILE}" \
+ /etc/system-release
+
+-mkdir -p "${initdir}/usr/share/plymouth"
++mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
+
+ if [[ $hostonly ]]; then
+ dracut_install "${usrlibdir}/plymouth/text.so" \
+@@ -34,7 +34,7 @@ else
+ for x in /usr/share/plymouth/themes/{text,details}/* ; do
+ [[ -f "$x" ]] || continue
+ THEME_DIR=$(dirname "$x")
+- mkdir -p "${initdir}/$THEME_DIR"
++ mkdir -m 0755 -p "${initdir}/$THEME_DIR"
+ dracut_install "$x"
+ done
+ for x in "${usrlibdir}"/plymouth/{text,details}.so ; do
+diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
+index 477975f..6f8628d 100755
+--- a/modules.d/50plymouth/plymouth-pretrigger.sh
++++ b/modules.d/50plymouth/plymouth-pretrigger.sh
+@@ -17,7 +17,7 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
+ [ -e /dev/fb ] || ln -s fb0 /dev/fb
+
+ info "Starting plymouth daemon"
+- mkdir -m 0755 -p /run/plymouth
++ mkdir -m 0755 /run/plymouth
+ [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
+ /bin/plymouth --show-splash 2>&1 | vinfo
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
+index c54a46d..928aff9 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root
++++ b/modules.d/90dmsquash-live/dmsquash-live-root
+@@ -43,7 +43,7 @@ getarg ro && liverw=ro
+ getarg rw && liverw=rw
+ [ -z "$liverw" ] && liverw=ro
+ # mount the backing of the live image first
+-mkdir -p /run/initramfs/live
++mkdir -m 0755 -p /run/initramfs/live
+ if [ -f $livedev ]; then
+ # no mount needed - we've already got the LiveOS image in initramfs
+ case $livedev in
+@@ -84,7 +84,7 @@ do_live_overlay() {
+ # need to know where to look for the overlay
+ setup=""
+ if [ -n "$devspec" -a -n "$pathspec" -a -n "$overlay" ]; then
+- mkdir /overlayfs
++ mkdir -m 0755 /run/initramfs/overlayfs
+ mount -n -t auto $devspec /overlayfs || :
+ if [ -f /overlayfs$pathspec -a -w /overlayfs$pathspec ]; then
+ losetup $OVERLAY_LOOPDEV /overlayfs$pathspec
+@@ -93,7 +93,7 @@ do_live_overlay() {
+ fi
+ setup="yes"
+ fi
+- umount -l /overlayfs || :
++ umount -l /run/initramfs/overlayfs || :
+ fi
+
+ if [ -z "$setup" ]; then
+@@ -125,11 +125,11 @@ if [ -n "$OSMINSQFS" ]; then
+ dd if=$OSMINSQFS of=/osmin.img 2> /dev/null
+ OSMIN_SQUASHED_LOOPDEV=$( losetup -f )
+ losetup -r $OSMIN_SQUASHED_LOOPDEV /osmin.img
+- mkdir -p /squashfs.osmin
+- mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /squashfs.osmin
++ mkdir -m 0755 -p /run/initramfs/squashfs.osmin
++ mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /run/initramfs/squashfs.osmin
+ OSMIN_LOOPDEV=$( losetup -f )
+- losetup -r $OSMIN_LOOPDEV /squashfs.osmin/osmin
+- umount -l /squashfs.osmin
++ losetup -r $OSMIN_LOOPDEV /run/initramfs/squashfs.osmin/osmin
++ umount -l /run/initramfs/squashfs.osmin
+ fi
+
+ # we might have an embedded fs image to use as rootfs (uncompressed live)
+@@ -164,8 +164,8 @@ if [ -e "$SQUASHED" ] ; then
+
+ SQUASHED_LOOPDEV=$( losetup -f )
+ losetup -r $SQUASHED_LOOPDEV $SQUASHED
+- mkdir -p /squashfs
+- mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /squashfs
++ mkdir -m 0755 -p /run/initramfs/squashfs
++ mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /run/initramfs/squashfs
+
+ BASE_LOOPDEV=$( losetup -f )
+ if [ -f /squashfs/LiveOS/ext3fs.img ]; then
+diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
+index fab0017..3f2a923 100755
+--- a/modules.d/90lvm/lvm_scan.sh
++++ b/modules.d/90lvm/lvm_scan.sh
+@@ -11,7 +11,7 @@ LVS=$(getargs rd.lvm.lv rd_LVM_LV=)
+ SNAPSHOT=$(getargs rd.lvm.snapshot rd_LVM_SNAPSHOT=)
+ SNAPSIZE=$(getargs rd.lvm.snapsize rd_LVM_SNAPSIZE=)
+
+-[ -d /etc/lvm ] || mkdir -p /etc/lvm
++[ -d /etc/lvm ] || mkdir -m 0755 -p /etc/lvm
+ # build a list of devices to scan
+ lvmdevs=$(
+ for f in /tmp/.lvm_scan-*; do
+diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
+index 2bccab4..b550156 100755
+--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
++++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+-[ -d /etc/modprobe.d ] || mkdir /etc/modprobe.d
++[ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
+
+ dasd_arg=$(getarg rd.dasd_mod.dasd rd_DASD_MOD=)
+ if [ -n "$dasd_arg" ]; then
+diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
+index f07a9ae..2ebff09 100755
+--- a/modules.d/95fcoe/module-setup.sh
++++ b/modules.d/95fcoe/module-setup.sh
+@@ -26,7 +26,7 @@ install() {
+ inst fipvlan
+ inst lldpad
+
+- mkdir -p "$initdir/var/lib/lldpad"
++ mkdir -m 0755 -p "$initdir/var/lib/lldpad"
+
+ inst "$moddir/fcoe-up" "/sbin/fcoe-up"
+ inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
+diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
+index 84673ab..ad6c257 100755
+--- a/modules.d/95nfs/module-setup.sh
++++ b/modules.d/95nfs/module-setup.sh
+@@ -49,9 +49,9 @@ install() {
+ inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
+ inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh"
+ inst "$moddir/nfsroot" "/sbin/nfsroot"
+- mkdir -p "$initdir/var/lib/nfs/rpc_pipefs"
+- mkdir -p "$initdir/var/lib/rpcbind"
+- mkdir -p "$initdir/var/lib/nfs/statd/sm"
++ mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
++ mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
++ mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"
+
+ # Rather than copy the passwd file in, just set a user for rpcbind
+ # We'll save the state and restart the daemon from the root anyway
+diff --git a/modules.d/95nfs/nfsroot-cleanup.sh b/modules.d/95nfs/nfsroot-cleanup.sh
+index b9fa771..b2f178e 100755
+--- a/modules.d/95nfs/nfsroot-cleanup.sh
++++ b/modules.d/95nfs/nfsroot-cleanup.sh
+@@ -16,7 +16,8 @@ pid=$(pidof rpcbind)
+
+ if incol2 /proc/mounts /var/lib/nfs/rpc_pipefs; then
+ # try to create the destination directory
+- [ -d $NEWROOT/$rpcpipefspath ] || mkdir -p $NEWROOT/$rpcpipefspath 2>/dev/null
++ [ -d $NEWROOT/$rpcpipefspath ] || \
++ mkdir -m 0755 -p $NEWROOT/$rpcpipefspath 2>/dev/null
+
+ if [ -d $NEWROOT/$rpcpipefspath ]; then
+ mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/$rpcpipefspath
+diff --git a/modules.d/98syslog/module-setup.sh b/modules.d/98syslog/module-setup.sh
+index 056e9d9..2fbef16 100755
+--- a/modules.d/98syslog/module-setup.sh
++++ b/modules.d/98syslog/module-setup.sh
+@@ -35,7 +35,7 @@ install() {
+ inst_hook pre-pivot 99 "$moddir/syslog-cleanup.sh"
+ inst_simple "$moddir/rsyslogd-start.sh" /sbin/rsyslogd-start
+ inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop
+- mkdir -p ${initdir}/etc/templates
++ mkdir -m 0755 -p ${initdir}/etc/templates
+ inst_simple "${moddir}/rsyslog.conf" /etc/templates
+ fi
+ }
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
+index 930138a..a5a3f59 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -453,10 +453,10 @@ mkuniqdir() {
+ local dir="$1"; local prefix="$2"
+ local retdir; local retdir_new
+
+- [ -d "${dir}" ] || mkdir -p "${dir}" || return 1
++ [ -d "${dir}" ] || mkdir -m 0755 -p "${dir}" || return 1
+
+ retdir=$(funiq "${dir}" "${prefix}") || return 1
+- until mkdir "${retdir}" 2>/dev/null; do
++ until mkdir -m 0755 "${retdir}" 2>/dev/null; do
+ retdir_new=$(funiq "${dir}" "${prefix}") || return 1
+ [ "$retdir_new" = "$retdir" ] && return 1
+ retdir="$retdir_new"
diff --git a/0021-console_init-plymouth-use-systemd-vconsole-if-availa.patch b/0021-console_init-plymouth-use-systemd-vconsole-if-availa.patch
new file mode 100644
index 0000000..6ce568b
--- /dev/null
+++ b/0021-console_init-plymouth-use-systemd-vconsole-if-availa.patch
@@ -0,0 +1,82 @@
+From cbb6006241577d443b0a68b10ecd733c523c5ff5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 28 Apr 2011 17:33:26 +0200
+Subject: [PATCH] console_init/plymouth: use systemd-vconsole, if available
+
+also init the console before starting the plymouth daemon
+---
+ modules.d/10i18n/console_init | 35 +++++++++++++++-----------
+ modules.d/10i18n/module-setup.sh | 1 +
+ modules.d/50plymouth/plymouth-pretrigger.sh | 2 +-
+ 3 files changed, 22 insertions(+), 16 deletions(-)
+
+diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
+index bdd39b0..30b2582 100755
+--- a/modules.d/10i18n/console_init
++++ b/modules.d/10i18n/console_init
+@@ -72,20 +72,25 @@ devname=${dev#/dev/}
+
+ [ -e /tmp/console_init.${devname} ] && exit 0
+
+-dev_open ${dev}
++if [ -x /lib/systemd/systemd-vconsole ]; then
++ /lib/systemd/systemd-vconsole
++else
++ dev_open ${dev}
++
++ for fd in 6 7; do
++ if ! [ -t ${fd} ]; then
++ echo "ERROR: File descriptor not opened: ${fd}" >&2
++ dev_close
++ exit 1
++ fi
++ done
++
++ set_keyboard
++ set_terminal ${dev}
++ set_font ${dev}
++ set_keymap
++
++ dev_close
++fi
+
+-for fd in 6 7; do
+- if ! [ -t ${fd} ]; then
+- echo "ERROR: File descriptor not opened: ${fd}" >&2
+- dev_close
+- exit 1
+- fi
+-done
+-
+-set_keyboard
+-set_terminal ${dev}
+-set_font ${dev}
+-set_keymap
+-
+-dev_close
+ >/tmp/console_init.${devname}
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index f764c8e..a374c33 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -11,6 +11,7 @@ depends() {
+ }
+
+ install() {
++ [ -x /lib/systemd/systemd-vconsole ] && dracut_install /lib/systemd/systemd-vconsole
+ KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
+ DEFAULT_FONT=LatArCyrHeb-16
+ I18N_CONF="/etc/locale.conf"
+diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
+index 6f8628d..222dc20 100755
+--- a/modules.d/50plymouth/plymouth-pretrigger.sh
++++ b/modules.d/50plymouth/plymouth-pretrigger.sh
+@@ -18,7 +18,7 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
+
+ info "Starting plymouth daemon"
+ mkdir -m 0755 /run/plymouth
+- [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
++ [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ /bin/plymouth --show-splash 2>&1 | vinfo
+ fi
diff --git a/0022-10i18n-s-systemd-vconsole-systemd-vconsole-setup-g.patch b/0022-10i18n-s-systemd-vconsole-systemd-vconsole-setup-g.patch
new file mode 100644
index 0000000..cca3077
--- /dev/null
+++ b/0022-10i18n-s-systemd-vconsole-systemd-vconsole-setup-g.patch
@@ -0,0 +1,38 @@
+From 27d174fa58e5f7b2e2bbc7a7c6c64f39653e0886 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 3 May 2011 10:34:06 +0200
+Subject: [PATCH] 10i18n: s/systemd-vconsole/systemd-vconsole-setup/g
+
+---
+ modules.d/10i18n/console_init | 4 ++--
+ modules.d/10i18n/module-setup.sh | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
+index 30b2582..c88053a 100755
+--- a/modules.d/10i18n/console_init
++++ b/modules.d/10i18n/console_init
+@@ -72,8 +72,8 @@ devname=${dev#/dev/}
+
+ [ -e /tmp/console_init.${devname} ] && exit 0
+
+-if [ -x /lib/systemd/systemd-vconsole ]; then
+- /lib/systemd/systemd-vconsole
++if [ -x /lib/systemd/systemd-vconsole-setup ]; then
++ /lib/systemd/systemd-vconsole-setup
+ else
+ dev_open ${dev}
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index a374c33..f2320c3 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -11,7 +11,7 @@ depends() {
+ }
+
+ install() {
+- [ -x /lib/systemd/systemd-vconsole ] && dracut_install /lib/systemd/systemd-vconsole
++ [ -x /lib/systemd/systemd-vconsole-setup ] && dracut_install /lib/systemd/systemd-vconsole-setup
+ KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
+ DEFAULT_FONT=LatArCyrHeb-16
+ I18N_CONF="/etc/locale.conf"
diff --git a/0023-10i18n-do-not-use-console_init-shell-script-if-syste.patch b/0023-10i18n-do-not-use-console_init-shell-script-if-syste.patch
new file mode 100644
index 0000000..0444055
--- /dev/null
+++ b/0023-10i18n-do-not-use-console_init-shell-script-if-syste.patch
@@ -0,0 +1,92 @@
+From 065a609633bda845b4ac821a139a1deab397c1f8 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 3 May 2011 14:48:05 +0200
+Subject: [PATCH] 10i18n: do not use console_init shell script, if systemd-vconsole-setup
+
+do not use console_init shell script, if systemd-vconsole-setup is
+available
+---
+ modules.d/10i18n/console_init | 34 +++++++++++++---------------------
+ modules.d/10i18n/parse-i18n.sh | 12 +++++++++---
+ 2 files changed, 22 insertions(+), 24 deletions(-)
+
+diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
+index c88053a..110cb0a 100755
+--- a/modules.d/10i18n/console_init
++++ b/modules.d/10i18n/console_init
+@@ -61,7 +61,6 @@ dev_open() {
+ exec 7>>${dev}
+ }
+
+-
+ dev=/dev/${1#/dev/}
+ devname=${dev#/dev/}
+
+@@ -70,27 +69,20 @@ devname=${dev#/dev/}
+ exit 1
+ }
+
+-[ -e /tmp/console_init.${devname} ] && exit 0
+-
+-if [ -x /lib/systemd/systemd-vconsole-setup ]; then
+- /lib/systemd/systemd-vconsole-setup
+-else
+- dev_open ${dev}
++dev_open ${dev}
+
+- for fd in 6 7; do
+- if ! [ -t ${fd} ]; then
+- echo "ERROR: File descriptor not opened: ${fd}" >&2
+- dev_close
+- exit 1
+- fi
+- done
++for fd in 6 7; do
++ if ! [ -t ${fd} ]; then
++ echo "ERROR: File descriptor not opened: ${fd}" >&2
++ dev_close
++ exit 1
++ fi
++done
+
+- set_keyboard
+- set_terminal ${dev}
+- set_font ${dev}
+- set_keymap
++set_keyboard
++set_terminal ${dev}
++set_font ${dev}
++set_keymap
+
+- dev_close
+-fi
++dev_close
+
+->/tmp/console_init.${devname}
+diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh
+index 9f47326..6b7e569 100755
+--- a/modules.d/10i18n/parse-i18n.sh
++++ b/modules.d/10i18n/parse-i18n.sh
+@@ -20,9 +20,9 @@ inst_key_val() {
+ }
+
+ inst_key_val '' /etc/vconsole.conf KEYMAP vconsole.keymap KEYTABLE
+-inst_key_val '' /etc/vconsole.conf FONT vconsole.font SYSFONT
+-inst_key_val '' /etc/vconsole.conf FONT_MAP vconsole.font.map CONTRANS
+-inst_key_val '' /etc/vconsole.conf FONT_UNIMAP vconsole.font.unimap UNIMAP
++inst_key_val '' /etc/vconsole.conf FONT vconsole.font SYSFONT
++inst_key_val '' /etc/vconsole.conf FONT_MAP vconsole.font.map CONTRANS
++inst_key_val '' /etc/vconsole.conf FONT_UNIMAP vconsole.font.unimap UNIMAP
+ inst_key_val 1 /etc/vconsole.conf UNICODE vconsole.unicode vconsole.font.unicode
+ inst_key_val '' /etc/vconsole.conf EXT_KEYMAP vconsole.keymap.ext
+
+@@ -35,3 +35,9 @@ if [ -f /etc/locale.conf ]; then
+ export LC_ALL
+ fi
+
++if [ -x /lib/systemd/systemd-vconsole-setup ]; then
++ /lib/systemd/systemd-vconsole-setup
++ rm -f /{etc,lib}/udev/rules.d/10-console.rules
++ rm -f /lib/udev/console_init
++ ln -s /lib/systemd/systemd-vconsole-setup /lib/udev/console_init
++fi
diff --git a/0024-plymouth-gensplash-reset-tty-after-plymouth-messed-w.patch b/0024-plymouth-gensplash-reset-tty-after-plymouth-messed-w.patch
new file mode 100644
index 0000000..769db2b
--- /dev/null
+++ b/0024-plymouth-gensplash-reset-tty-after-plymouth-messed-w.patch
@@ -0,0 +1,40 @@
+From 09c6d6511019591b2f153bcb96bb2262900e9304 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 3 May 2011 14:47:45 +0200
+Subject: [PATCH] plymouth/gensplash: reset tty after plymouth messed with it
+
+---
+ modules.d/50gensplash/gensplash-pretrigger.sh | 3 ++-
+ modules.d/50plymouth/plymouth-pretrigger.sh | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/50gensplash/gensplash-pretrigger.sh b/modules.d/50gensplash/gensplash-pretrigger.sh
+index b0330a4..074aa78 100755
+--- a/modules.d/50gensplash/gensplash-pretrigger.sh
++++ b/modules.d/50gensplash/gensplash-pretrigger.sh
+@@ -9,8 +9,9 @@ if getargbool 1 rd.splash -n rd_NO_SPLASH; then
+
+ info "Starting Gentoo Splash"
+
+- [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
++ [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
+ CDROOT=0
+ . /lib/gensplash-lib.sh
+ splash init
++ [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
+ fi
+diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
+index 222dc20..25ed06f 100755
+--- a/modules.d/50plymouth/plymouth-pretrigger.sh
++++ b/modules.d/50plymouth/plymouth-pretrigger.sh
+@@ -18,7 +18,9 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
+
+ info "Starting plymouth daemon"
+ mkdir -m 0755 /run/plymouth
+- [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
++ [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
+ [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ /bin/plymouth --show-splash 2>&1 | vinfo
++ # reset tty after plymouth messed with it
++ [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
+ fi
diff --git a/dracut.spec b/dracut.spec
index 7bd8429..9683500 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,7 +8,7 @@
Name: dracut
Version: 009
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora}
@@ -20,25 +20,30 @@ Group: System/Base
License: GPLv2+
URL: https://dracut.wiki.kernel.org/
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-009.tar.bz2
-Patch3: 0003-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
-Patch4: 0004-dracut-simplify-kernel-version-argument-setting.patch
-Patch5: 0005-dracut-source-reformat-with-line-breaks.patch
-Patch6: 0006-dracut-functions-bashified-ret-ret-to-ret.patch
-Patch7: 0007-dracut-removed-extra-char-in-Including-modules-done.patch
-Patch8: 0008-dracut-add-lib-firmware-updates-to-default-firmware-.patch
-Patch9: 0009-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
-Patch10: 0010-Ensure-rpc_pipefs-is-mounted.patch
-Patch11: 0011-plymouth-gensplash-check-for-console_init-before-cal.patch
-Patch12: 0012-base-init-fix-cdrom-polling.patch
-Patch13: 0013-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
-Patch14: 0014-doc-s-init.log-run-initramfs-init.log-g.patch
-Patch15: 0015-base-init-fixed-compat-dev-.initramfs-copy.patch
-Patch16: 0016-fips-fixed-boot-dev-handling.patch
-Patch17: 0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
-Patch18: 0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
-Patch19: 0019-base-dracut-lib.sh-changed-kmgs-log-levels.patch
-Patch20: 0020-base-init-reset-PATH-after-the-run-move.patch
-Patch27: 0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
+Patch1: 0001-dracut-don-t-skip-zero-length-string-outfile-argumen.patch
+Patch2: 0002-dracut-simplify-kernel-version-argument-setting.patch
+Patch3: 0003-dracut-source-reformat-with-line-breaks.patch
+Patch4: 0004-dracut-functions-bashified-ret-ret-to-ret.patch
+Patch5: 0005-dracut-removed-extra-char-in-Including-modules-done.patch
+Patch6: 0006-dracut-add-lib-firmware-updates-to-default-firmware-.patch
+Patch7: 0007-40network-dhcp-root.sh-s-initqueue-finished-initqueu.patch
+Patch8: 0008-Ensure-rpc_pipefs-is-mounted.patch
+Patch9: 0009-plymouth-gensplash-check-for-console_init-before-cal.patch
+Patch10: 0010-base-init-fix-cdrom-polling.patch
+Patch11: 0011-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
+Patch12: 0012-doc-s-init.log-run-initramfs-init.log-g.patch
+Patch13: 0013-base-init-fixed-compat-dev-.initramfs-copy.patch
+Patch14: 0014-fips-fixed-boot-dev-handling.patch
+Patch15: 0015-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
+Patch16: 0016-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
+Patch17: 0017-base-dracut-lib.sh-changed-kmgs-log-levels.patch
+Patch18: 0018-base-init-reset-PATH-after-the-run-move.patch
+Patch19: 0019-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch
+Patch20: 0020-mkdir-always-with-m-0755.patch
+Patch21: 0021-console_init-plymouth-use-systemd-vconsole-if-availa.patch
+Patch22: 0022-10i18n-s-systemd-vconsole-systemd-vconsole-setup-g.patch
+Patch23: 0023-10i18n-do-not-use-console_init-shell-script-if-syste.patch
+Patch24: 0024-plymouth-gensplash-reset-tty-after-plymouth-messed-w.patch
BuildArch: noarch
@@ -172,6 +177,8 @@ This package contains tools to assemble the local initrd and host configuration.
%prep
%setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -190,7 +197,10 @@ This package contains tools to assemble the local initrd and host configuration.
%patch18 -p1
%patch19 -p1
%patch20 -p1
-%patch27 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
%build
make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -327,6 +337,12 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Wed May 04 2011 Harald Hoyer <harald at redhat.com> 009-7
+- fixed mkdir for /run
+Resolves: rhbz#699113
+- fixed console reset after plymouth started
+Resolves: rhbz#700971
+
* Mon Apr 18 2011 Harald Hoyer <harald at redhat.com> 009-6
- do not fail on empty ld.so.conf.d
Resolves: rhbz#696997
More information about the scm-commits
mailing list