[dracut/f18] dracut-024-15.git20121218
Harald Hoyer
harald at fedoraproject.org
Tue Dec 18 15:48:21 UTC 2012
commit 3a9209a75deddf85782969011345b75ff4e9d3f6
Author: Harald Hoyer <harald at redhat.com>
Date: Tue Dec 18 16:47:49 2012 +0100
dracut-024-15.git20121218
- fixed mediacheck
Resolves: rhbz#874486
- fixed mount move of rpc_pipefs
Resolves: rhbz#860525
- add "timeout=0" to /etc/crypttab in the initramfs
Resolves: rhbz#881670
...dracut.sh-only-save-kernel_cmdline-if-set.patch | 2 +-
....d-fedora.conf.example-s-kernelcmdline-ke.patch | 2 +-
...fup.sh-do_static-and-do_ipv6auto-return-0.patch | 6 +-
....sh-only-warn-not-error-if-we-don-t-strip.patch | 2 +-
...cut.sh-do-not-strip-signed-kernel-modules.patch | 47 +++++++++++++++++
...i18n.sh-fix-locale.conf-caused-by-4dbc1d1.patch | 26 ++++++++++
0007-network-fixed-MAC-address-assignment.patch | 53 ++++++++++++++++++++
...uash-live-add-systemd-checkisomd5-service.patch | 48 ++++++++++++++++++
...-run-generator.sh-do-not-timeout-for-LUKS.patch | 23 +++++++++
...cut-cmdline.service-run-before-systemd-vc.patch | 23 +++++++++
...apoff-to-initramfs-to-fix-shutdown-reboot.patch | 23 +++++++++
...-add-iputils-and-iproute-requirement-for-.patch | 23 +++++++++
...oot-cleanup.sh-mount-bind-instead-of-move.patch | 24 +++++++++
...root.sh-reload-rules-after-adding-99-iscs.patch | 22 ++++++++
dracut.spec | 23 ++++++++-
15 files changed, 339 insertions(+), 8 deletions(-)
---
diff --git a/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch b/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
index 691e3f7..772692e 100644
--- a/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
+++ b/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
@@ -1,4 +1,4 @@
-From 636e5cd2d53c8165a0dc5f857af643fd15faea9d Mon Sep 17 00:00:00 2001
+From d316776f2fd9e7d499a8054c6292362ae9e234c0 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 19 Oct 2012 11:09:38 +0200
Subject: [PATCH] dracut.sh: only save $kernel_cmdline, if set
diff --git a/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch b/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
index 5fe2d45..91cd1c2 100644
--- a/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
+++ b/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
@@ -1,4 +1,4 @@
-From e743cfdd4bab527fa39e773be7dd48c8325c8eee Mon Sep 17 00:00:00 2001
+From 16b501e2975a1aed9e87895e4daad16827de4109 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 19 Oct 2012 11:10:03 +0200
Subject: [PATCH] dracut.conf.d/fedora.conf.example:
diff --git a/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch b/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
index 7e4c1c9..ee63f30 100644
--- a/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
+++ b/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
@@ -1,8 +1,8 @@
-From 8bf25df6408af65a95318b967b6ca64ead643f0e Mon Sep 17 00:00:00 2001
+From 50e350a6c5c549c4b11682df86d6773f4255d60d Mon Sep 17 00:00:00 2001
From: WANG Chao <chaowang at redhat.com>
Date: Thu, 18 Oct 2012 16:43:28 +0800
-Subject: [PATCH] 40network/ifup.sh: do_static() and do_ipv6auto return 0 if
- no errors.
+Subject: [PATCH] 40network/ifup.sh: do_static() and do_ipv6auto return 0 if no
+ errors.
Commit a0be1ed removes some lines from do_static() and do_ipv6auto().
diff --git a/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch b/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
index bc5cb2a..dbad1f0 100644
--- a/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
+++ b/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
@@ -1,4 +1,4 @@
-From b26897fb6099ed9ee67ed6e19e751be11d38fcf3 Mon Sep 17 00:00:00 2001
+From 7285b9e9ba039b7b788c102e2c94e900a868a0c8 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 19 Oct 2012 11:20:07 +0200
Subject: [PATCH] dracut.sh: only 'warn' not 'error', if we don't strip
diff --git a/0005-dracut.sh-do-not-strip-signed-kernel-modules.patch b/0005-dracut.sh-do-not-strip-signed-kernel-modules.patch
new file mode 100644
index 0000000..00f0ebd
--- /dev/null
+++ b/0005-dracut.sh-do-not-strip-signed-kernel-modules.patch
@@ -0,0 +1,47 @@
+From 34c1b859c2e3a33d278013cff5e13298906de0df Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 21 Nov 2012 10:47:38 +0100
+Subject: [PATCH] dracut.sh: do not strip signed kernel modules
+
+https://bugzilla.redhat.com/show_bug.cgi?id=873796
+---
+ dracut.sh | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index e463404..469f408 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1041,21 +1041,27 @@ if [[ $do_strip = yes ]] ; then
+ dinfo "*** Stripping files ***"
+ if [[ $DRACUT_FIPS_MODE ]]; then
+ find "$initdir" -type f \
+- '(' -perm -0100 -or -perm -0010 -or -perm -0001 \
+- -or -path '*/lib/modules/*.ko' ')' -print0 \
++ -executable -not -path '*/lib/modules/*.ko' -print0 \
+ | while read -r -d $'\0' f; do
+ if ! [[ -e "${f%/*}/.${f##*/}.hmac" ]] \
+ && ! [[ -e "/lib/fipscheck/${f##*/}.hmac" ]] \
+ && ! [[ -e "/lib64/fipscheck/${f##*/}.hmac" ]]; then
+ echo -n "$f"; echo -n -e "\000"
+ fi
+- done |xargs -r -0 strip -g 2>/dev/null
++ done | xargs -r -0 strip -g 2>/dev/null
+ else
+ find "$initdir" -type f \
+- '(' -perm -0100 -or -perm -0010 -or -perm -0001 \
+- -or -path '*/lib/modules/*.ko' ')' -print0 \
++ -executable -not -path '*/lib/modules/*.ko' -print0 \
+ | xargs -r -0 strip -g 2>/dev/null
+ fi
++
++ # strip kernel modules, but do not touch signed modules
++ find "$initdir" -type f -path '*/lib/modules/*.ko' -print0 \
++ | while read -r -d $'\0' f; do
++ SIG=$(tail -c 28 "$f")
++ [[ $SIG == '~Module signature appended~' ]] || { echo -n "$f"; echo -n -e "\000"; }
++ done | xargs -r -0 strip -g
++
+ dinfo "*** Stripping files done ***"
+ fi
+
diff --git a/0006-i18n-parse-i18n.sh-fix-locale.conf-caused-by-4dbc1d1.patch b/0006-i18n-parse-i18n.sh-fix-locale.conf-caused-by-4dbc1d1.patch
new file mode 100644
index 0000000..7aab161
--- /dev/null
+++ b/0006-i18n-parse-i18n.sh-fix-locale.conf-caused-by-4dbc1d1.patch
@@ -0,0 +1,26 @@
+From 8353633f4ec037a160e1cf551f71c44abc758c69 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 22 Nov 2012 11:58:37 +0100
+Subject: [PATCH] i18n/parse-i18n.sh: fix locale.conf caused by
+ 4dbc1d1bb3dcbb173b02
+
+https://bugzilla.redhat.com/show_bug.cgi?id=870632
+---
+ modules.d/10i18n/parse-i18n.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh
+index 5a3d804..9427194 100755
+--- a/modules.d/10i18n/parse-i18n.sh
++++ b/modules.d/10i18n/parse-i18n.sh
+@@ -26,8 +26,8 @@ inst_key_val '' /etc/vconsole.conf vconsole.font.unimap FONT_UNIMAP -d UNIMAP
+ inst_key_val 1 /etc/vconsole.conf vconsole.font.unicode UNICODE vconsole.unicode
+ inst_key_val '' /etc/vconsole.conf vconsole.keymap.ext EXT_KEYMAP
+
+-inst_key_val '' /etc/locale.conf LANG locale.LANG
+-inst_key_val '' /etc/locale.conf LC_ALL locale.LC_ALL
++inst_key_val '' /etc/locale.conf locale.LANG LANG
++inst_key_val '' /etc/locale.conf locale.LC_ALL LC_ALL
+
+ if [ -f /etc/locale.conf ]; then
+ . /etc/locale.conf
diff --git a/0007-network-fixed-MAC-address-assignment.patch b/0007-network-fixed-MAC-address-assignment.patch
new file mode 100644
index 0000000..6158397
--- /dev/null
+++ b/0007-network-fixed-MAC-address-assignment.patch
@@ -0,0 +1,53 @@
+From 11ac7cd6c8257421ed13c66b829bf69320b7b11d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 26 Nov 2012 13:49:38 +0100
+Subject: [PATCH] network: fixed MAC address assignment
+
+---
+ modules.d/40network/ifup.sh | 6 +++---
+ modules.d/40network/net-lib.sh | 9 ++++++++-
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index db233de..70bc161 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -96,10 +96,10 @@ do_ipv6auto() {
+ do_static() {
+ strstr $ip '*:*:*' && load_ipv6
+
+- ip link set $netif up
++ ip link set dev $netif up
+ wait_for_if_up $netif
+- [ -n "$macaddr" ] && ip link set address $macaddr
+- [ -n "$mtu" ] && ip link set mtu $mtu
++ [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
++ [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
+ if strstr $ip '*:*:*'; then
+ # note no ip addr flush for ipv6
+ ip addr add $ip/$mask dev $netif
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 10b630e..9b2f291 100644
+--- a/modules.d/40network/net-lib.sh
++++ b/modules.d/40network/net-lib.sh
+@@ -1,4 +1,6 @@
+ #!/bin/sh
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+ get_ip() {
+ local iface="$1" ip=""
+@@ -272,7 +274,12 @@ ip_to_var() {
+ 2) dev=$1; autoconf=$2 ;;
+ 3) dev=$1; autoconf=$2; mtu=$3 ;;
+ 4) dev=$1; autoconf=$2; mtu=$3; macaddr=$4 ;;
+- *) ip=$1; srv=$2; gw=$3; mask=$4; hostname=$5; dev=$6; autoconf=$7; mtu=$8; macaddr=$9 ;;
++ *) ip=$1; srv=$2; gw=$3; mask=$4;
++ hostname=$5; dev=$6; autoconf=$7; mtu=$8;
++ if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then
++ macaddr="${9}:${10}:${11}:${12}:${13}:${14}"
++ fi
++ ;;
+ esac
+ # anaconda-style argument cluster
+ if strstr "$autoconf" "*.*.*.*"; then
diff --git a/0008-dmsquash-live-add-systemd-checkisomd5-service.patch b/0008-dmsquash-live-add-systemd-checkisomd5-service.patch
new file mode 100644
index 0000000..edfa6b9
--- /dev/null
+++ b/0008-dmsquash-live-add-systemd-checkisomd5-service.patch
@@ -0,0 +1,48 @@
+From 1e0e20bcef40befd5d668e2fe21db9202caea7b0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 14 Dec 2012 08:57:22 +0100
+Subject: [PATCH] dmsquash-live: add systemd checkisomd5 service
+
+---
+ modules.d/90dmsquash-live/checkisomd5 at .service | 13 +++++++++++++
+ modules.d/90dmsquash-live/dmsquash-live-root.sh | 7 ++++++-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+ create mode 100644 modules.d/90dmsquash-live/checkisomd5 at .service
+
+diff --git a/modules.d/90dmsquash-live/checkisomd5 at .service b/modules.d/90dmsquash-live/checkisomd5 at .service
+new file mode 100644
+index 0000000..20e40bd
+--- /dev/null
++++ b/modules.d/90dmsquash-live/checkisomd5 at .service
+@@ -0,0 +1,13 @@
++[Unit]
++Description=Media check on %f
++DefaultDependencies=no
++Before=shutdown.target
++
++[Service]
++Type=oneshot
++RemainAfterExit=no
++ExecStart=/bin/checkisomd5 --verbose %f
++StandardInput=tty-force
++StandardOutput=inherit
++StandardError=inherit
++TimeoutSec=0
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+index a7bb202..ec22977 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -32,7 +32,12 @@ fi
+ getarg rd.live.check -d check || check=""
+ if [ -n "$check" ]; then
+ [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+- checkisomd5 --verbose $livedev
++ if [ -n "DRACUT_SYSTEMD" ]; then
++ p=$(str_replace "$livedev" "-" '\x2d')
++ systemctl start checkisomd5@${p}.service
++ else
++ checkisomd5 --verbose $livedev
++ fi
+ if [ $? -ne 0 ]; then
+ die "CD check failed!"
+ exit 1
diff --git a/0009-crypt-crypt-run-generator.sh-do-not-timeout-for-LUKS.patch b/0009-crypt-crypt-run-generator.sh-do-not-timeout-for-LUKS.patch
new file mode 100644
index 0000000..15a11c1
--- /dev/null
+++ b/0009-crypt-crypt-run-generator.sh-do-not-timeout-for-LUKS.patch
@@ -0,0 +1,23 @@
+From 4ea1126e5fcd8d2c1e00194c6e0a10e9293e9d86 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 30 Nov 2012 15:22:43 +0100
+Subject: [PATCH] crypt/crypt-run-generator.sh: do not timeout for LUKS
+ passwords with systemd
+
+---
+ modules.d/90crypt/crypt-run-generator.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
+index bacdbbe..6c322c2 100755
+--- a/modules.d/90crypt/crypt-run-generator.sh
++++ b/modules.d/90crypt/crypt-run-generator.sh
+@@ -22,7 +22,7 @@ if strstr "$(cryptsetup --help)" "allow-discards"; then
+ fi
+ fi
+
+-echo "$luks $dev none $allowdiscards" >> /etc/crypttab
++echo "$luks $dev - timeout=0,$allowdiscards" >> /etc/crypttab
+
+ if command -v systemctl >/dev/null; then
+ systemctl daemon-reload
diff --git a/0010-systemd-dracut-cmdline.service-run-before-systemd-vc.patch b/0010-systemd-dracut-cmdline.service-run-before-systemd-vc.patch
new file mode 100644
index 0000000..94d535e
--- /dev/null
+++ b/0010-systemd-dracut-cmdline.service-run-before-systemd-vc.patch
@@ -0,0 +1,23 @@
+From 447298791b6e557484e33d3f7c0bc085a3093dc0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 29 Nov 2012 15:53:15 +0100
+Subject: [PATCH] systemd/dracut-cmdline.service: run before
+ systemd-vconsole-setup
+
+cmdline does generate vconsole.conf, which is needed by vconsole-setup
+---
+ modules.d/98systemd/dracut-cmdline.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/98systemd/dracut-cmdline.service b/modules.d/98systemd/dracut-cmdline.service
+index 75f9b7e..4aba918 100644
+--- a/modules.d/98systemd/dracut-cmdline.service
++++ b/modules.d/98systemd/dracut-cmdline.service
+@@ -12,6 +12,7 @@ Description=dracut cmdline hook
+ Documentation=man:dracut-cmdline.service(8)
+ DefaultDependencies=no
+ Before=dracut-pre-udev.service
++Before=systemd-vconsole-setup.service
+ After=systemd-journald.socket
+ Wants=systemd-journald.socket
+ ConditionPathExists=/etc/initrd-release
diff --git a/0011-add-swapoff-to-initramfs-to-fix-shutdown-reboot.patch b/0011-add-swapoff-to-initramfs-to-fix-shutdown-reboot.patch
new file mode 100644
index 0000000..22a8d0a
--- /dev/null
+++ b/0011-add-swapoff-to-initramfs-to-fix-shutdown-reboot.patch
@@ -0,0 +1,23 @@
+From d70a6f5067e4e4341b3447d2712573a816f2e16b Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods at redhat.com>
+Date: Wed, 24 Oct 2012 13:06:28 -0400
+Subject: [PATCH] add 'swapoff' to initramfs to fix shutdown/reboot
+
+systemd shutdown/reboot won't work unless 'swapoff' is available.
+---
+ modules.d/98systemd/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
+index 6e6bf07..91743ee 100755
+--- a/modules.d/98systemd/module-setup.sh
++++ b/modules.d/98systemd/module-setup.sh
+@@ -85,7 +85,7 @@ install() {
+ $systemdsystemunitdir/initrd-switch-root.target \
+ $systemdsystemunitdir/initrd-switch-root.service \
+ $systemdsystemunitdir/umount.target \
+- journalctl systemctl echo
++ journalctl systemctl echo swapoff
+
+ if [[ $hostonly ]]; then
+ dracut_install -o /etc/systemd/journald.conf \
diff --git a/0012-dracut.spec-add-iputils-and-iproute-requirement-for-.patch b/0012-dracut.spec-add-iputils-and-iproute-requirement-for-.patch
new file mode 100644
index 0000000..86b4bb8
--- /dev/null
+++ b/0012-dracut.spec-add-iputils-and-iproute-requirement-for-.patch
@@ -0,0 +1,23 @@
+From ea4a6798372a06c92d2403ef533779ee298287bf Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 27 Nov 2012 13:25:46 +0100
+Subject: [PATCH] dracut.spec: add iputils and iproute requirement for
+ dracut-network
+
+---
+ dracut.spec | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dracut.spec b/dracut.spec
+index e38f2d1..e6f85b3 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -106,6 +106,8 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
+ %package network
+ Summary: dracut modules to build a dracut initramfs with network support
+ Requires: %{name} = %{version}-%{release}
++Requires: iputils
++Requires: iproute
+ Obsoletes: dracut-generic < 008
+ Provides: dracut-generic = %{version}-%{release}
+
diff --git a/0013-nfs-nfsroot-cleanup.sh-mount-bind-instead-of-move.patch b/0013-nfs-nfsroot-cleanup.sh-mount-bind-instead-of-move.patch
new file mode 100644
index 0000000..3b90ab0
--- /dev/null
+++ b/0013-nfs-nfsroot-cleanup.sh-mount-bind-instead-of-move.patch
@@ -0,0 +1,24 @@
+From a1837eaf84714cefb082ae8701210ab2c876a62f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 29 Nov 2012 16:07:35 +0100
+Subject: [PATCH] nfs/nfsroot-cleanup.sh: mount --bind instead of --move
+
+---
+ modules.d/95nfs/nfsroot-cleanup.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/95nfs/nfsroot-cleanup.sh b/modules.d/95nfs/nfsroot-cleanup.sh
+index 5610016..586749c 100755
+--- a/modules.d/95nfs/nfsroot-cleanup.sh
++++ b/modules.d/95nfs/nfsroot-cleanup.sh
+@@ -22,7 +22,9 @@ if incol2 /proc/mounts /var/lib/nfs/rpc_pipefs; then
+ mkdir -m 0755 -p $NEWROOT/$rpcpipefspath 2>/dev/null
+
+ if [ -d $NEWROOT/$rpcpipefspath ]; then
+- mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/$rpcpipefspath
++ # mount --move does not seem to work???
++ mount --bind /var/lib/nfs/rpc_pipefs $NEWROOT/$rpcpipefspath
++ umount /var/lib/nfs/rpc_pipefs
+ else
+ umount /var/lib/nfs/rpc_pipefs
+ fi
diff --git a/0014-iscsi-iscsiroot.sh-reload-rules-after-adding-99-iscs.patch b/0014-iscsi-iscsiroot.sh-reload-rules-after-adding-99-iscs.patch
new file mode 100644
index 0000000..0fa92a1
--- /dev/null
+++ b/0014-iscsi-iscsiroot.sh-reload-rules-after-adding-99-iscs.patch
@@ -0,0 +1,22 @@
+From 19257061644d510051a26173c98639aac0ff081d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 30 Nov 2012 11:13:17 +0100
+Subject: [PATCH] iscsi/iscsiroot.sh: reload rules after adding
+ 99-iscsi-root.rules
+
+---
+ modules.d/95iscsi/iscsiroot.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
+index 1a8cc8d..20738cf 100755
+--- a/modules.d/95iscsi/iscsiroot.sh
++++ b/modules.d/95iscsi/iscsiroot.sh
+@@ -135,6 +135,7 @@ handle_netroot()
+ if [ -z "$root" -o -n "${root%%block:*}" ]; then
+ # if root is not specified try to mount the whole iSCSI LUN
+ printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules
++ udevadm control --reload
+
+ # install mount script
+ echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
diff --git a/dracut.spec b/dracut.spec
index ceaf035..46a2eb1 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 024
-Release: 10.git20121121%{?dist}
+Release: 15.git20121218%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -33,8 +33,17 @@ Patch1: 0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
Patch2: 0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
Patch3: 0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
Patch4: 0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
+Patch5: 0005-dracut.sh-do-not-strip-signed-kernel-modules.patch
+Patch6: 0006-i18n-parse-i18n.sh-fix-locale.conf-caused-by-4dbc1d1.patch
+Patch7: 0007-network-fixed-MAC-address-assignment.patch
+Patch8: 0008-dmsquash-live-add-systemd-checkisomd5-service.patch
+Patch9: 0009-crypt-crypt-run-generator.sh-do-not-timeout-for-LUKS.patch
+Patch10: 0010-systemd-dracut-cmdline.service-run-before-systemd-vc.patch
+Patch11: 0011-add-swapoff-to-initramfs-to-fix-shutdown-reboot.patch
+Patch12: 0012-dracut.spec-add-iputils-and-iproute-requirement-for-.patch
+Patch13: 0013-nfs-nfsroot-cleanup.sh-mount-bind-instead-of-move.patch
+Patch14: 0014-iscsi-iscsiroot.sh-reload-rules-after-adding-99-iscs.patch
-Patch6: 0006-dracut.sh-do-not-strip-signed-kernel-modules.patch
BuildRequires: dash bash git
@@ -112,6 +121,8 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
%package network
Summary: dracut modules to build a dracut initramfs with network support
Requires: %{name} = %{version}-%{release}
+Requires: iputils
+Requires: iproute
Obsoletes: dracut-generic < 008
Provides: dracut-generic = %{version}-%{release}
@@ -367,6 +378,14 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Tue Dec 18 2012 Harald Hoyer <harald at redhat.com> 024-15.git20121218
+- fixed mediacheck
+Resolves: rhbz#874486
+- fixed mount move of rpc_pipefs
+Resolves: rhbz#860525
+- add "timeout=0" to /etc/crypttab in the initramfs
+Resolves: rhbz#881670
+
* Wed Nov 21 2012 Harald Hoyer <harald at redhat.com> 024-10.git20121121
- do not strip signed kernel modules
Resolves: rhbz#873796
More information about the scm-commits
mailing list