[dracut] fixed type in host device recognition

[Harald Hoyer]

commit 5393c4a6838e89907aaecab45ca3dbced8389bfc
Author: Harald Hoyer <harald at redhat.com>
Date:   Mon Aug 12 13:00:14 2013 +0200

    fixed type in host device recognition

 0024-dracut-logger.sh-saveguard-logger-with.patch  |   22 ++++++++++++++++
 0025-dracut.sh-use-local-lsinitrd.sh-for-l.patch   |   26 ++++++++++++++++++++
 0026-dracut.sh-fixed-typo.patch                    |   22 ++++++++++++++++
 ...-t-install-switch_root-if-systemd-is-used.patch |   26 ++++++++++++++++++++
 dracut.spec                                        |    9 ++++++-
 5 files changed, 104 insertions(+), 1 deletions(-)
---
diff --git a/0024-dracut-logger.sh-saveguard-logger-with.patch b/0024-dracut-logger.sh-saveguard-logger-with.patch
new file mode 100644
index 0000000..fab1219
--- /dev/null
+++ b/0024-dracut-logger.sh-saveguard-logger-with.patch
@@ -0,0 +1,22 @@
+From 3e70a25bcf2fb49fbc81d110d3186bddf4f81ad0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 12 Aug 2013 12:44:10 +0200
+Subject: [PATCH] dracut-logger.sh: saveguard logger with --
+
+---
+ dracut-logger.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-logger.sh b/dracut-logger.sh
+index ff23301..0c505e2 100755
+--- a/dracut-logger.sh
++++ b/dracut-logger.sh
+@@ -323,7 +323,7 @@ _do_dlog() {
+         if [[ "$_dlogfd" ]]; then
+             echo "<$(_dlvl2syslvl $lvl)>$msg" >&$_dlogfd
+         else
+-            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) "$msg"
++            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) -- "$msg"
+         fi
+     fi
+ 
diff --git a/0025-dracut.sh-use-local-lsinitrd.sh-for-l.patch b/0025-dracut.sh-use-local-lsinitrd.sh-for-l.patch
new file mode 100644
index 0000000..990a1b4
--- /dev/null
+++ b/0025-dracut.sh-use-local-lsinitrd.sh-for-l.patch
@@ -0,0 +1,26 @@
+From dadd2b698ef7d0c069dce58ccad5543337b007c9 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 12 Aug 2013 12:46:03 +0200
+Subject: [PATCH] dracut.sh: use local lsinitrd.sh for "-l"
+
+---
+ dracut.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 0b674ae..6208c82 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1271,7 +1271,11 @@ mv -- "$outfile.$$" "$outfile"
+ dinfo "*** Creating image file done ***"
+ 
+ if (( maxloglvl >= 5 )); then
+-    lsinitrd "$outfile"| ddebug
++    if [[ $allowlocal ]]; then
++	"$dracutbasedir/lsinitrd.sh" "$outfile"| ddebug
++    else
++        lsinitrd "$outfile"| ddebug
++    fi
+ fi
+ 
+ exit 0
diff --git a/0026-dracut.sh-fixed-typo.patch b/0026-dracut.sh-fixed-typo.patch
new file mode 100644
index 0000000..853dacd
--- /dev/null
+++ b/0026-dracut.sh-fixed-typo.patch
@@ -0,0 +1,22 @@
+From e95b672376314602777989bcb416bf7037ca77bc Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 12 Aug 2013 12:46:35 +0200
+Subject: [PATCH] dracut.sh: fixed typo
+
+---
+ dracut.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 6208c82..2ac3d8b 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -877,7 +877,7 @@ if [[ $hostonly ]]; then
+         mp=$(readlink -f "$mp")
+         mountpoint "$mp" >/dev/null 2>&1 || continue
+         _dev=$(find_block_device "$mp")
+-        _bdev=$(readlink -f "/dev/block/$dev")
++        _bdev=$(readlink -f "/dev/block/$_dev")
+         [[ -b $_bdev ]] && _dev=$_bdev
+         push host_devs $_dev
+         [[ "$_mp" == "/" ]] && root_dev="$_dev"
diff --git a/0027-base-don-t-install-switch_root-if-systemd-is-used.patch b/0027-base-don-t-install-switch_root-if-systemd-is-used.patch
new file mode 100644
index 0000000..f4ff516
--- /dev/null
+++ b/0027-base-don-t-install-switch_root-if-systemd-is-used.patch
@@ -0,0 +1,26 @@
+From 109283a8830f7b9c1d4bb6b4852f1bff0d36bf30 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 12 Aug 2013 12:57:13 +0200
+Subject: [PATCH] base: don't install switch_root, if systemd is used
+
+---
+ modules.d/99base/module-setup.sh | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
+index f217ccb..52ce400 100755
+--- a/modules.d/99base/module-setup.sh
++++ b/modules.d/99base/module-setup.sh
+@@ -41,11 +41,10 @@ install() {
+ 
+     mkdir -p ${initdir}/tmp
+ 
+-    inst_multiple switch_root || dfatal "Failed to install switch_root"
+-
+     inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
+ 
+     if ! dracut_module_included "systemd"; then
++        inst_multiple switch_root || dfatal "Failed to install switch_root"
+         inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
+     fi
+ 
diff --git a/dracut.spec b/dracut.spec
index 2eb5225..1b97501 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 031
-Release: 24.git20130809%{?dist}
+Release: 28.git20130812%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -52,6 +52,10 @@ Patch20: 0020-multipath-need_shutdown-if-multipath-devices-exist.patch
 Patch21: 0021-omit-drivers-fix.patch
 Patch22: 0022-lsinitrd.sh-fixed-case.patch
 Patch23: 0023-dracut-logger.sh-do-not-unset-logging-messages-if-sy.patch
+Patch24: 0024-dracut-logger.sh-saveguard-logger-with.patch
+Patch25: 0025-dracut.sh-use-local-lsinitrd.sh-for-l.patch
+Patch26: 0026-dracut.sh-fixed-typo.patch
+Patch27: 0027-base-don-t-install-switch_root-if-systemd-is-used.patch
 
 
 BuildRequires: bash git
@@ -467,6 +471,9 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 12 2013 Harald Hoyer <harald at redhat.com> 031-28.git20130812
+- fixed typo in hostonly device recognition
+
 * Fri Aug 09 2013 Harald Hoyer <harald at redhat.com> 031-24.git20130809
 - fixed logging to journal