[dracut] dracut-027-10.git20130405
Harald Hoyer
harald at fedoraproject.org
Fri Apr 5 10:06:21 UTC 2013
commit 38a2ddf58ab8d5ff3c1ce0d9abc5931612ef5167
Author: Harald Hoyer <harald at redhat.com>
Date: Fri Apr 5 12:05:17 2013 +0200
dracut-027-10.git20130405
- fix crypto password timeout on the dracut side
...h => 0001-dracut.spec-Require-systemd-199.patch | 14 +-
...ule-setup.sh-call-systemd-in-private-dir-.patch | 23 -
...kernel-install.d-51-dracut-rescue.install.patch | 118 ------
0002-base-init.sh-fix-version-output.patch | 22 +
0003-base-dracut-lib.sh-add-dev_unit_name.patch | 42 ++
....example-make-hostonly-default-for-fedora.patch | 51 ---
...rse-crypt.sh-create-udev-rule-for-systemd.patch | 31 ++
0004-dracut.sh-remove-default-marker-in-help.patch | 57 ---
...-lib.sh-wait_for_dev-cancel_wait_for_dev-.patch | 111 +++++
...dd-new-default-path-to-initramfs-accordin.patch | 40 --
...issing-options-to-manpage-and-help-output.patch | 134 ++++++
0006-add-rescue-dracut-module.patch | 35 --
0007-TEST-50-MULTINIC-fixup-test-suite.patch | 151 +++++++
...ut.sh-move-cleanup-trap-just-after-mktemp.patch | 37 --
...STSUITE-s-i6300esbwdt-i6300esb-ib700wdt-g.patch | 50 +++
0008-dracut.spec-add-rescue-module.patch | 21 -
...escue.install-do-not-unset-installonly-on.patch | 26 --
0009-TEST-99-RPM-ignore-rescue-images.patch | 21 +
...-fix-for-default-initrd-not-found-but-ima.patch | 39 --
0011-lsinitrd.sh-removed-trailing.patch | 22 -
0012-make-host_fs_types-a-hashmap.patch | 406 ------------------
...sh-add-swap-partitions-to-host-only-setup.patch | 37 --
0014-add-51-dracut-rescue-postinst.sh.patch | 247 -----------
...c-add-nohostonly-and-norescue-subpackages.patch | 66 ---
...-simplify-check-for-boot-loader-spec-dirs.patch | 22 -
...escue.install-create-directory-if-it-does.patch | 25 --
...al-fs.target-is-now-root-fs.target-and-in.patch | 201 ---------
...d-modules-load.d-modules-to-the-initramfs.patch | 57 ---
0020-systemd-add-sysctl.d-and-sysctl.conf.patch | 38 --
...outh-do-not-install-hooks-in-systemd-mode.patch | 33 --
0022-dracut.sh-add-regenerate-all.patch | 88 ----
0023-add-dracut-bash-completion.sh.patch | 119 ------
0024-dracut.spec-fix-requirements.patch | 39 --
...ramfs-restore.sh-also-look-for-image-in-b.patch | 47 ---
0026-print-memdebug-to-stderr.patch | 26 --
0027-Improve-documentation-of-rd.memdebug.patch | 31 --
...bug-at-different-points-in-99base-init.sh.patch | 73 ----
...remove-upstream-renamed-old-service-files.patch | 36 --
...les-move-usb-storage-out-of-fixed-drivers.patch | 29 --
...racut.sh-Add-noimageifnotneeded-parameter.patch | 96 -----
...utdown.sh-mount-move-all-basic-mounts-out.patch | 40 --
...-DHCPV6C-yes-for-each-dhcp-ipv4-configura.patch | 25 --
...BOOTPROTO-ibft-for-ip-ibft-to-ifcfg-files.patch | 61 ---
0035-TODO-remove-completed-items.patch | 24 --
...escue-postinst.sh-fixed-new-kernel-pkg-ca.patch | 22 -
0037-dracut-install-handle-more-ldd-errors.patch | 26 --
0038-dracut.spec-fix-requirements.patch | 31 --
0039-ifcfg-write-ifcfg.sh-fixed-typo.patch | 22 -
...root.sh-do-not-mount-manually-in-systemd-.patch | 38 --
...nfsroot.sh-only-cat-etc-fstab-if-existant.patch | 22 -
...-rules-module-setup.sh-do-not-install-run.patch | 23 -
0043-systemd-switch-to-new-initrd.target.patch | 234 -----------
...md-do-not-use-systemd-version-until-fixed.patch | 30 --
0045-fix-typo-in-dracut.conf.5.asc.patch | 23 -
0046-fixed-testsuite.patch | 436 --------------------
...h-use-o-short-monotonic-for-the-journal-o.patch | 22 -
...-completion.sh-add-kver-kernel-version-co.patch | 24 --
0050-TEST-16-DMSQUASH-use-current-releasever.patch | 22 -
...onf.5.asc-remove-duplicated-install_items.patch | 24 --
...sh-live-force-load-squashfs-kernel-module.patch | 27 --
...kdir-run-initramfs-if-it-does-not-exist-y.patch | 22 -
...les-module-setup.sh-install-all-host-file.patch | 76 ----
...les-module-setup.sh-don-t-fail-hard-on-a-.patch | 22 -
...e-D_FILE_OFFSET_BITS-64-to-build-dracut-i.patch | 22 -
...module-setup.sh-redirect-grep-to-dev-null.patch | 23 -
0058-systemd-add-more-ordering.patch | 68 ---
0059-add-dracut.bootup.7-man-page.patch | 299 --------------
...ib.sh-write_fs_tab-start-initrd-root-fs.t.patch | 21 -
0061-nbd-nbdroot.sh-fix-root-blockdev-case.patch | 80 ----
0062-network-netroot.sh-do-not-unset-root.patch | 23 -
...40-NBD-test.sh-kill_server-after-test_run.patch | 23 -
...racut-rescue-postinst.sh-add-extra-checks.patch | 23 -
...escue-postinst.sh-Rename-image-and-grub-e.patch | 54 ---
...escue-postinst.sh-51-dracut-rescue.instal.patch | 46 --
...t.sh-remove-temporary-cpio-output-in-trap.patch | 22 -
...spec-use-pkg-config-for-bashcompletiondir.patch | 32 --
0069-dracut.spec-use-configure.patch | 99 -----
...urn-off-host-only-mode-if-essential-syste.patch | 30 --
...urn-off-hostonly-mode-if-udev-database-is.patch | 25 --
dracut.spec | 14 +-
80 files changed, 582 insertions(+), 4379 deletions(-)
---
diff --git a/0047-dracut.spec-bump-systemd-version-requirement.patch b/0001-dracut.spec-Require-systemd-199.patch
similarity index 51%
rename from 0047-dracut.spec-bump-systemd-version-requirement.patch
rename to 0001-dracut.spec-Require-systemd-199.patch
index 97de6b8..064bc80 100644
--- a/0047-dracut.spec-bump-systemd-version-requirement.patch
+++ b/0001-dracut.spec-Require-systemd-199.patch
@@ -1,22 +1,22 @@
-From 7e9fc37db84636de2f704d165ff0ffdc6e964530 Mon Sep 17 00:00:00 2001
+From d50cf62d62069c50eb1afed9d377aa2cc8c967ef Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
-Date: Fri, 15 Mar 2013 07:11:17 +0100
-Subject: [PATCH] dracut.spec: bump systemd version requirement
+Date: Tue, 26 Mar 2013 17:04:43 +0100
+Subject: [PATCH] dracut.spec: Require systemd >= 199
---
dracut.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.spec b/dracut.spec
-index 4870390..ac4a786 100644
+index af417a4..cb605c6 100644
--- a/dracut.spec
+++ b/dracut.spec
-@@ -86,7 +86,7 @@ Requires: kbd kbd-misc
+@@ -92,7 +92,7 @@ Requires: kbd kbd-misc
%if 0%{?fedora} || 0%{?rhel} > 6
Requires: util-linux >= 2.21
--Requires: systemd >= 198-4
-+Requires: systemd >= 198-5
+-Requires: systemd >= 198-5
++Requires: systemd >= 199
Conflicts: grubby < 8.23
%else
Requires: udev > 166
diff --git a/0002-base-init.sh-fix-version-output.patch b/0002-base-init.sh-fix-version-output.patch
new file mode 100644
index 0000000..e53968e
--- /dev/null
+++ b/0002-base-init.sh-fix-version-output.patch
@@ -0,0 +1,22 @@
+From cc6f0925df421a4f7945cd80f0f88bd629454607 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 2 Apr 2013 13:29:24 +0200
+Subject: [PATCH] base/init.sh: fix version output
+
+---
+ modules.d/99base/init.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
+index b441a27..410201a 100755
+--- a/modules.d/99base/init.sh
++++ b/modules.d/99base/init.sh
+@@ -104,7 +104,7 @@ else
+ fi
+
+ [ -f /etc/initrd-release ] && . /etc/initrd-release
+-[ -n "$VERSION" ] && info "dracut-$VERSION"
++[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
+
+ source_conf /etc/conf.d
+
diff --git a/0003-base-dracut-lib.sh-add-dev_unit_name.patch b/0003-base-dracut-lib.sh-add-dev_unit_name.patch
new file mode 100644
index 0000000..769942a
--- /dev/null
+++ b/0003-base-dracut-lib.sh-add-dev_unit_name.patch
@@ -0,0 +1,42 @@
+From c4b572b5ca767aec6cc8b5ba98b5fc76c991f690 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 4 Apr 2013 12:51:33 +0200
+Subject: [PATCH] base/dracut-lib.sh: add dev_unit_name()
+
+add helper function to convert device path to systemd unit names
+---
+ modules.d/99base/dracut-lib.sh | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
+index e456b01..79fc953 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -818,6 +818,15 @@ wait_for_mount()
+ } >> "$hookdir/emergency/90-${_name}.sh"
+ }
+
++dev_unit_name()
++{
++ _name="${1%%/}"
++ _name="${_name##/}"
++ _name="$(str_replace "$_name" '-' '\x2d')"
++ _name="$(str_replace "$_name" '/' '-')"
++ echo "$_name"
++}
++
+ # wait_for_dev <dev>
+ #
+ # Installs a initqueue-finished script,
+@@ -835,10 +844,7 @@ wait_for_dev()
+ } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
+
+ if [ -n "$DRACUT_SYSTEMD" ]; then
+- _name="${1%%/}"
+- _name="${_name##/}"
+- _name="$(str_replace "$_name" '-' '\x2d')"
+- _name="$(str_replace "$_name" '/' '-')"
++ _name=$(dev_unit_name "$1")
+ if ! [ -L ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device ]; then
+ [ -d ${PREFIX}/etc/systemd/system/initrd.target.requires ] || mkdir -p ${PREFIX}/etc/systemd/system/initrd.target.requires
+ ln -s ../${_name}.device ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device
diff --git a/0004-crypt-parse-crypt.sh-create-udev-rule-for-systemd.patch b/0004-crypt-parse-crypt.sh-create-udev-rule-for-systemd.patch
new file mode 100644
index 0000000..13f35bf
--- /dev/null
+++ b/0004-crypt-parse-crypt.sh-create-udev-rule-for-systemd.patch
@@ -0,0 +1,31 @@
+From ab9b04f55bb9917749e9ddb52ce8f5f1ef56af99 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 4 Apr 2013 12:54:59 +0200
+Subject: [PATCH] crypt/parse-crypt.sh: create udev rule for systemd
+
+Start the systemd-cryptsetup at luks-*.service for the detected crypto_LUKS
+device in the initqueue, so we block in the initqueue and wait for the
+password entry.
+---
+ modules.d/90crypt/parse-crypt.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
+index d61220c..4cb281b 100755
+--- a/modules.d/90crypt/parse-crypt.sh
++++ b/modules.d/90crypt/parse-crypt.sh
+@@ -27,6 +27,14 @@ else
+ printf -- '--name cryptroot-ask-%%k %s ' $(command -v cryptroot-ask)
+ printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
+ } >> /etc/udev/rules.d/70-luks.rules.new
++ else
++ {
++ printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
++ printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
++ printf -- 'RUN+="%s --unique --onetime ' $(command -v initqueue)
++ printf -- '--name systemd-cryptsetup-%%k %s start ' $(command -v systemctl)
++ printf -- 'systemd-cryptsetup at luks$$(dev_unit_name -$env{ID_FS_UUID}).service"\n'
++ } >> /etc/udev/rules.d/70-luks.rules.new
+ fi
+
+ uuid=$luksid
diff --git a/0005-base-dracut-lib.sh-wait_for_dev-cancel_wait_for_dev-.patch b/0005-base-dracut-lib.sh-wait_for_dev-cancel_wait_for_dev-.patch
new file mode 100644
index 0000000..4902f24
--- /dev/null
+++ b/0005-base-dracut-lib.sh-wait_for_dev-cancel_wait_for_dev-.patch
@@ -0,0 +1,111 @@
+From 6db8c5a5fe5b77de757e7b669c8277cd2dafaf8e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 4 Apr 2013 12:56:42 +0200
+Subject: [PATCH] base/dracut-lib.sh:wait_for_dev()/cancel_wait_for_dev() set
+ systemd timeouts
+
+Set systemd unit timeouts for the devices we wait for. The systemd
+default is 90 seconds, which is way too low for complicated setups.
+---
+ modules.d/99base/dracut-lib.sh | 15 ++++++++++++++-
+ modules.d/99base/module-setup.sh | 14 +++++++-------
+ modules.d/99base/wait-host-devs.sh | 20 --------------------
+ 3 files changed, 21 insertions(+), 28 deletions(-)
+ delete mode 100644 modules.d/99base/wait-host-devs.sh
+
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
+index 79fc953..f2b16d3 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -849,6 +849,13 @@ wait_for_dev()
+ [ -d ${PREFIX}/etc/systemd/system/initrd.target.requires ] || mkdir -p ${PREFIX}/etc/systemd/system/initrd.target.requires
+ ln -s ../${_name}.device ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device
+ fi
++
++ mkdir -p ${PREFIX}/etc/systemd/system/${_name}.device.d
++ {
++ echo "[Unit]"
++ echo "JobTimeoutSec=3600"
++ } > ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf
++ [ -z "$PREFIX" ] && /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
+ fi
+ }
+
+@@ -858,6 +865,12 @@ cancel_wait_for_dev()
+ _name="$(str_replace "$1" '/' '\\x2f')"
+ rm -f "$hookdir/initqueue/finished/devexists-${_name}.sh"
+ rm -f "$hookdir/emergency/80-${_name}.sh"
++ if [ -n "$DRACUT_SYSTEMD" ]; then
++ _name=$(dev_unit_name "$1")
++ rm -f ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device
++ rm -f ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf
++ /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
++ fi
+ }
+
+ killproc() {
+@@ -1023,7 +1036,7 @@ listlist() {
+
+ # returns OK if both lists contain the same values. An order and a duplication
+ # doesn't matter.
+-#
++#
+ # $1 = separator
+ # $2 = list1
+ # $3 = list2
+diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
+index 7f2940b..4955b7b 100755
+--- a/modules.d/99base/module-setup.sh
++++ b/modules.d/99base/module-setup.sh
+@@ -89,18 +89,18 @@ install() {
+
+ ## save host_devs which we need bring up
+ (
++ if dracut_module_included "systemd"; then
++ DRACUT_SYSTEMD=1
++ fi
++ PREFIX="$initdir"
++
+ . "$moddir/dracut-lib.sh"
++
+ for _dev in ${host_devs[@]}; do
+ _pdev=$(get_persistent_dev $_dev)
+
+ case "$_pdev" in
+- /dev/?*)
+- if ! dracut_module_included "systemd"; then
+- PREFIX="$initdir" wait_for_dev $_pdev
+- else
+- DRACUT_SYSTEMD=1 PREFIX="$initdir" wait_for_dev $_pdev
+- fi
+- ;;
++ /dev/?*) wait_for_dev $_pdev;;
+ *) ;;
+ esac
+ done
+diff --git a/modules.d/99base/wait-host-devs.sh b/modules.d/99base/wait-host-devs.sh
+deleted file mode 100644
+index ce84922..0000000
+--- a/modules.d/99base/wait-host-devs.sh
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#!/bin/sh
+-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+-# ex: ts=8 sw=4 sts=4 et filetype=sh
+-
+-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+-
+-wait_host_devs() {
+- local _dev
+-
+- while read _dev; do
+- case "$_dev" in
+- /dev/?*)
+- wait_for_dev $_dev
+- ;;
+- *) ;;
+- esac
+- done < $1
+-}
+-
+-[ -f /etc/host_devs ] && wait_host_devs /etc/host_devs
diff --git a/0006-Add-missing-options-to-manpage-and-help-output.patch b/0006-Add-missing-options-to-manpage-and-help-output.patch
new file mode 100644
index 0000000..f0a0cff
--- /dev/null
+++ b/0006-Add-missing-options-to-manpage-and-help-output.patch
@@ -0,0 +1,134 @@
+From ea3c4e827367448f3303fb9be0d33105cea1aead Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 5 Apr 2013 09:01:48 +0200
+Subject: [PATCH] Add missing options to manpage and --help output
+
+https://bugzilla.redhat.com/show_bug.cgi?id=948510
+---
+ dracut.8.asc | 30 +++++++++++++++++++++++++-----
+ dracut.sh | 26 ++++++++++++++++----------
+ 2 files changed, 41 insertions(+), 15 deletions(-)
+
+diff --git a/dracut.8.asc b/dracut.8.asc
+index 6a79d12..8b50782 100644
+--- a/dracut.8.asc
++++ b/dracut.8.asc
+@@ -75,12 +75,12 @@ version is:
+ ----
+
+ If you want to create lighter, smaller initramfs images, you may want to specify
+-the --host-only or -H option. Using this option, the resulting image will
++the --hostonly or -H option. Using this option, the resulting image will
+ contain only those dracut modules, kernel modules and filesystems, which are
+ needed to boot this specific machine. This has the drawback, that you can't put
+ the disk on another controller or machine, and that you can't switch to another
+ root filesystem, without recreating the initramfs image. The usage of the
+---host-only option is only for experts and you will have to keep the broken
++--hostonly option is only for experts and you will have to keep the broken
+ pieces. At least keep a copy of a general purpose image (and corresponding
+ kernel) as a fallback to rescue your system.
+
+@@ -376,7 +376,7 @@ will not be able to boot. Equivalent to "--compress=bzip2"
+ [WARNING]
+ ====
+ Make sure your kernel has lzma decompression support compiled in, otherwise you
+-will not be able to boot. Equivalent to "--compress=lzma -9"
++will not be able to boot. Equivalent to "lzma --compress=lzma -9"
+ ====
+
+ **--xz**::
+@@ -385,8 +385,7 @@ will not be able to boot. Equivalent to "--compress=lzma -9"
+ [WARNING]
+ ====
+ Make sure your kernel has xz decompression support compiled in, otherwise you
+-will not be able to boot. Equivalent to "--compress=xz --check=crc32
+---lzma2=dict=1MiB"
++will not be able to boot. Equivalent to "lzma --compress=xz --check=crc32 --lzma2=dict=1MiB"
+ ====
+
+ **--compress** _<compressor>_::
+@@ -409,6 +408,27 @@ will not be able to boot. Equivalent to "--compress=xz --check=crc32
+ **--keep**::
+ Keep the initramfs temporary directory for debugging purposes.
+
++**--printsize**::
++ Print out the module install size
++
++**--profile**:
++ Output profile information of the build process
++
++**--ro-mnt**:
++ Mount / and /usr read-only by default.
++
++**-L, --stdlog** _<level>_::
++ [0-6] Specify logging level (to standard error)
++----
++ 0 - suppress any messages
++ 1 - only fatal errors
++ 2 - all errors
++ 3 - warnings
++ 4 - info
++ 5 - debug info (here starts lots of output)
++ 6 - trace info (and even more)
++----
++
+ **--regenerate-all**::
+ Regenerate all initramfs images at the default location with the kernel versions found on the system.
+ Additional parameters are passed through.
+diff --git a/dracut.sh b/dracut.sh
+index 5e9ea3e..586172c 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -74,19 +74,21 @@ Creates initial ramdisk images for preloading modules
+ call when building the initramfs. Modules are located
+ in /usr/lib/dracut/modules.d.
+ -o, --omit [LIST] Omit a space-separated list of dracut modules.
++ --force-add [LIST] Force to add a space-separated list of dracut modules
++ to the default set of modules, when -H is specified.
+ -d, --drivers [LIST] Specify a space-separated list of kernel modules to
+- exclusively include in the initramfs.
+- --add-drivers [LIST] Specify a space-separated list of kernel
+- modules to add to the initramfs.
++ exclusively include in the initramfs.
++ --add-drivers [LIST] Specify a space-separated list of kernel
++ modules to add to the initramfs.
+ --omit-drivers [LIST] Specify a space-separated list of kernel
+- modules not to add to the initramfs.
++ modules not to add to the initramfs.
+ --filesystems [LIST] Specify a space-separated list of kernel filesystem
+- modules to exclusively include in the generic
+- initramfs.
++ modules to exclusively include in the generic
++ initramfs.
+ -k, --kmoddir [DIR] Specify the directory, where to look for kernel
+- modules
++ modules
+ --fwdir [DIR] Specify additional directories, where to look for
+- firmwares, separated by :
++ firmwares, separated by :
+ --kernel-only Only install kernel drivers and firmware files
+ --no-kernel Do not install kernel drivers and firmware files
+ --kernel-cmdline [PARAMETERS] Specify default kernel command line parameters
+@@ -317,7 +319,9 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
+ --long quiet \
+ --long local \
+ --long hostonly \
++ --long host-only \
+ --long no-hostonly \
++ --long no-host-only \
+ --long fstab \
+ --long help \
+ --long bzip2 \
+@@ -391,8 +395,10 @@ while :; do
+ [[ -f "$(readlink -f ${0%/*})/dracut-functions.sh" ]] \
+ && dracutbasedir="$(readlink -f ${0%/*})"
+ ;;
+- -H|--hostonly) hostonly_l="yes" ;;
+- -N|--no-hostonly) hostonly_l="no" ;;
++ -H|--hostonly|--host-only)
++ hostonly_l="yes" ;;
++ -N|--no-hostonly|--no-host-only)
++ hostonly_l="no" ;;
+ --fstab) use_fstab_l="yes" ;;
+ -h|--help) long_usage; exit 1 ;;
+ -i|--include) push include_src "$2"
diff --git a/0007-TEST-50-MULTINIC-fixup-test-suite.patch b/0007-TEST-50-MULTINIC-fixup-test-suite.patch
new file mode 100644
index 0000000..b59275c
--- /dev/null
+++ b/0007-TEST-50-MULTINIC-fixup-test-suite.patch
@@ -0,0 +1,151 @@
+From a8986425a4af56a50c8986228e2df04efc5f9edf Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 5 Apr 2013 11:05:39 +0200
+Subject: [PATCH] TEST-50-MULTINIC: fixup test suite
+
+qemu of the day doesn't like multicast anymore
+---
+ test/TEST-50-MULTINIC/server-init.sh | 54 +++++++++++++++++++++++++++++++++---
+ test/TEST-50-MULTINIC/test.sh | 23 +++++++--------
+ 2 files changed, 60 insertions(+), 17 deletions(-)
+
+diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-50-MULTINIC/server-init.sh
+index 144f83c..5a8359b 100755
+--- a/test/TEST-50-MULTINIC/server-init.sh
++++ b/test/TEST-50-MULTINIC/server-init.sh
+@@ -7,11 +7,53 @@ export PS1='nfstest-server:\w\$ '
+ stty sane
+ echo "made it to the rootfs!"
+ echo server > /proc/sys/kernel/hostname
++
++wait_for_if_link() {
++ local cnt=0
++ local li
++ while [ $cnt -lt 600 ]; do
++ li=$(ip -o link show dev $1 2>/dev/null)
++ [ -n "$li" ] && return 0
++ sleep 0.1
++ cnt=$(($cnt+1))
++ done
++ return 1
++}
++
++wait_for_if_up() {
++ local cnt=0
++ local li
++ while [ $cnt -lt 200 ]; do
++ li=$(ip -o link show up dev $1)
++ [ -n "$li" ] && return 0
++ sleep 0.1
++ cnt=$(($cnt+1))
++ done
++ return 1
++}
++
++wait_for_route_ok() {
++ local cnt=0
++ while [ $cnt -lt 200 ]; do
++ li=$(ip route show)
++ [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
++ sleep 0.1
++ cnt=$(($cnt+1))
++ done
++ return 1
++}
++
++linkup() {
++ wait_for_if_link $1 2>/dev/null\
++ && ip link set $1 up 2>/dev/null\
++ && wait_for_if_up $1 2>/dev/null
++}
++
+ >/dev/watchdog
+ ip addr add 127.0.0.1/8 dev lo
+-ip link set lo up
++linkup lo
+ ip addr add 192.168.50.1/24 dev eth0
+-ip link set eth0 up
++linkup eth0
+ >/dev/watchdog
+ modprobe af_packet
+ > /dev/watchdog
+@@ -42,10 +84,14 @@ exportfs -r
+ chmod 777 /var/lib/dhcpd/dhcpd.leases
+ >/dev/watchdog
+ dhcpd -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases
+-echo -n 'V' > /dev/watchdog
++#echo -n 'V' > /dev/watchdog
+ #sh -i
++#tcpdump -i eth0
+ # Wait forever for the VM to die
+ echo "Serving NFS mounts"
+-while :; do sleep 30; done
++while :; do
++ sleep 10
++ >/dev/watchdog
++done
+ mount -n -o remount,ro /
+ poweroff -f
+diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
+index a3aa679..5cb0971 100755
+--- a/test/TEST-50-MULTINIC/test.sh
++++ b/test/TEST-50-MULTINIC/test.sh
+@@ -8,7 +8,6 @@ KVERSION=${KVERSION-$(uname -r)}
+ # Uncomment this to debug failures
+ #DEBUGFAIL="rd.shell"
+ #SERIAL="tcp:127.0.0.1:9999"
+-SERIAL="null"
+
+ run_server() {
+ # Start server first
+@@ -19,9 +18,9 @@ run_server() {
+ -hda $TESTDIR/server.ext3 \
+ -m 512M -smp 2 \
+ -display none \
+- -netdev socket,mcast=230.0.0.1:12320,id=net0 \
+- -net nic,macaddr=52:54:01:12:34:56,model=e1000,netdev=net0 \
+- -serial $SERIAL \
++ -net socket,listen=127.0.0.1:12350 \
++ -net nic,macaddr=52:54:01:12:34:56,model=e1000 \
++ ${SERIAL+-serial $SERIAL} \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-$KVERSION \
+ -append "loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+@@ -53,15 +52,13 @@ client_test() {
+ fi
+
+ $testdir/run-qemu -hda $TESTDIR/client.img -m 512M -smp 2 -nographic \
+- -netdev socket,mcast=230.0.0.1:12320,id=net0 \
+- -net nic,netdev=net0,macaddr=52:54:00:12:34:$mac1,model=e1000 \
+- -netdev socket,mcast=230.0.0.1:12320,id=net1 \
+- -net nic,netdev=net1,macaddr=52:54:00:12:34:$mac2,model=e1000 \
+- -netdev socket,mcast=230.0.0.1:12320,id=net2 \
+- -net nic,netdev=net2,macaddr=52:54:00:12:34:$mac3,model=e1000 \
++ -net socket,connect=127.0.0.1:12350 \
++ -net nic,macaddr=52:54:00:12:34:$mac1,model=e1000 \
++ -net nic,macaddr=52:54:00:12:34:$mac2,model=e1000 \
++ -net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-$KVERSION \
+- -append "$cmdline $DEBUGFAIL rd.retry=5 rd.info ro rd.systemd.log_level=debug console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \
++ -append "$cmdline $DEBUGFAIL rd.retry=5 rd.info ro console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
+ -initrd $TESTDIR/initramfs.testing
+
+ if [[ $? -ne 0 ]] || ! grep -m 1 -q OK $TESTDIR/client.img; then
+@@ -252,14 +249,14 @@ test_setup() {
+ # Make server's dracut image
+ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \
+- -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esbwdt" \
++ -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \
+ -f $TESTDIR/initramfs.server $KVERSION || return 1
+
+ # Make client's dracut image
+ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth" \
+ -a "debug" \
+- -d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esbwdt" \
++ -d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \
+ -f $TESTDIR/initramfs.testing $KVERSION || return 1
+ }
+
diff --git a/0008-TESTSUITE-s-i6300esbwdt-i6300esb-ib700wdt-g.patch b/0008-TESTSUITE-s-i6300esbwdt-i6300esb-ib700wdt-g.patch
new file mode 100644
index 0000000..fbb3bba
--- /dev/null
+++ b/0008-TESTSUITE-s-i6300esbwdt-i6300esb-ib700wdt-g.patch
@@ -0,0 +1,50 @@
+From 56fb5c4dbf15e45b2c76f047f8b2b8953cea2e46 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 5 Apr 2013 11:07:55 +0200
+Subject: [PATCH] TESTSUITE: s/i6300esbwdt/i6300esb ib700wdt/g
+
+---
+ test/TEST-01-BASIC/test.sh | 2 +-
+ test/TEST-03-USR-MOUNT/test.sh | 2 +-
+ test/TEST-40-NBD/test.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
+index 7727cd0..84f4b7d 100755
+--- a/test/TEST-01-BASIC/test.sh
++++ b/test/TEST-01-BASIC/test.sh
+@@ -86,7 +86,7 @@ test_setup() {
+ )
+ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -a "debug watchdog" \
+- -d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esbwdt" \
++ -d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esb ib700wdt" \
+ -f $TESTDIR/initramfs.testing $KVERSION || return 1
+
+ # -o "plymouth network md dmraid multipath fips caps crypt btrfs resume dmsquash-live dm"
+diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
+index 680720b..ca7dc12 100755
+--- a/test/TEST-03-USR-MOUNT/test.sh
++++ b/test/TEST-03-USR-MOUNT/test.sh
+@@ -122,7 +122,7 @@ test_setup() {
+ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -a "debug watchdog" \
+ -o "network" \
+- -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esbwdt" \
++ -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
+ -f $TESTDIR/initramfs.testing $KVERSION || return 1
+
+ rm -rf $TESTDIR/overlay
+diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
+index 88570af..208b784 100755
+--- a/test/TEST-40-NBD/test.sh
++++ b/test/TEST-40-NBD/test.sh
+@@ -356,7 +356,7 @@ test_setup() {
+ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth" \
+ -a "debug watchdog" \
+- -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esbwdt" \
++ -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esb ib700wdt" \
+ -f $TESTDIR/initramfs.testing $KVERSION || return 1
+ }
+
diff --git a/0009-TEST-99-RPM-ignore-rescue-images.patch b/0009-TEST-99-RPM-ignore-rescue-images.patch
new file mode 100644
index 0000000..d4df6fa
--- /dev/null
+++ b/0009-TEST-99-RPM-ignore-rescue-images.patch
@@ -0,0 +1,21 @@
+From db9fbaf9b8753bad46fb7c43d860e234919d2bc9 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 5 Apr 2013 11:52:33 +0200
+Subject: [PATCH] TEST-99-RPM: ignore rescue images
+
+---
+ test/TEST-99-RPM/test.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
+index 66f0beb..f030cb0 100755
+--- a/test/TEST-99-RPM/test.sh
++++ b/test/TEST-99-RPM/test.sh
+@@ -50,6 +50,7 @@ find / -xdev -type f -not -path '/var/*' \
+ -not -path '/test.output' \
+ -not -path '/etc/nsswitch.conf.bak' \
+ -not -path '/etc/iscsi/initiatorname.iscsi' \
++ -not -path '/boot/*0-rescue*' \
+ -not -path '/dev/null' \
+ -exec rpm -qf '{}' ';' | \
+ fgrep 'not owned' &> /test.output
diff --git a/dracut.spec b/dracut.spec
index ea4317e..4db4dac 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 027
-Release: 1%{?dist}
+Release: 10.git20130405%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -29,6 +29,15 @@ URL: https://dracut.wiki.kernel.org/
# Source can be generated by
# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+Patch1: 0001-dracut.spec-Require-systemd-199.patch
+Patch2: 0002-base-init.sh-fix-version-output.patch
+Patch3: 0003-base-dracut-lib.sh-add-dev_unit_name.patch
+Patch4: 0004-crypt-parse-crypt.sh-create-udev-rule-for-systemd.patch
+Patch5: 0005-base-dracut-lib.sh-wait_for_dev-cancel_wait_for_dev-.patch
+Patch6: 0006-Add-missing-options-to-manpage-and-help-output.patch
+Patch7: 0007-TEST-50-MULTINIC-fixup-test-suite.patch
+Patch8: 0008-TESTSUITE-s-i6300esbwdt-i6300esb-ib700wdt-g.patch
+Patch9: 0009-TEST-99-RPM-ignore-rescue-images.patch
BuildRequires: dash bash git
@@ -438,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT
%{dracutlibdir}/dracut.conf.d/02-norescue.conf
%changelog
+* Fri Apr 05 2013 Harald Hoyer <harald at redhat.com> 027-10.git20130405
+- fix crypto password timeout on the dracut side
+
* Tue Mar 26 2013 Harald Hoyer <harald at redhat.com> 027-1
- version 027
More information about the scm-commits
mailing list