diff --git a/.gitignore b/.gitignore
index b89cced..798e30e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/dracut-025.tar.bz2
/dracut-026.tar.bz2
/dracut-027.tar.bz2
+/dracut-028.tar.bz2
diff --git a/0001-dracut.spec-Require-systemd-199.patch b/0001-dracut.spec-Require-systemd-199.patch
deleted file mode 100644
index 064bc80..0000000
--- a/0001-dracut.spec-Require-systemd-199.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d50cf62d62069c50eb1afed9d377aa2cc8c967ef Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-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 af417a4..cb605c6 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -92,7 +92,7 @@ Requires: kbd kbd-misc
-
- %if 0%{?fedora} || 0%{?rhel} > 6
- Requires: util-linux >= 2.21
--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
deleted file mode 100644
index e53968e..0000000
--- a/0002-base-init.sh-fix-version-output.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cc6f0925df421a4f7945cd80f0f88bd629454607 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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
deleted file mode 100644
index 769942a..0000000
--- a/0003-base-dracut-lib.sh-add-dev_unit_name.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c4b572b5ca767aec6cc8b5ba98b5fc76c991f690 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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
deleted file mode 100644
index 13f35bf..0000000
--- a/0004-crypt-parse-crypt.sh-create-udev-rule-for-systemd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab9b04f55bb9917749e9ddb52ce8f5f1ef56af99 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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@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@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
deleted file mode 100644
index 4902f24..0000000
--- a/0005-base-dracut-lib.sh-wait_for_dev-cancel_wait_for_dev-.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 6db8c5a5fe5b77de757e7b669c8277cd2dafaf8e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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
deleted file mode 100644
index f0a0cff..0000000
--- a/0006-Add-missing-options-to-manpage-and-help-output.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From ea3c4e827367448f3303fb9be0d33105cea1aead Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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
deleted file mode 100644
index b59275c..0000000
--- a/0007-TEST-50-MULTINIC-fixup-test-suite.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From a8986425a4af56a50c8986228e2df04efc5f9edf Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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
deleted file mode 100644
index fbb3bba..0000000
--- a/0008-TESTSUITE-s-i6300esbwdt-i6300esb-ib700wdt-g.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 56fb5c4dbf15e45b2c76f047f8b2b8953cea2e46 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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
deleted file mode 100644
index d4df6fa..0000000
--- a/0009-TEST-99-RPM-ignore-rescue-images.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From db9fbaf9b8753bad46fb7c43d860e234919d2bc9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@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/0010-nfs-module-setup.sh-combine-egreps-for-etc-passwd-an.patch b/0010-nfs-module-setup.sh-combine-egreps-for-etc-passwd-an.patch
deleted file mode 100644
index 4395394..0000000
--- a/0010-nfs-module-setup.sh-combine-egreps-for-etc-passwd-an.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 41bfa5dad1d0a1ccdef70bd74068e5d4d67d5e27 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 5 Apr 2013 16:34:36 +0200
-Subject: [PATCH] nfs/module-setup.sh: combine egreps for /etc/passwd and
- /etc/group
-
----
- modules.d/95nfs/module-setup.sh | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
-index 7c3a64d..6d4d412 100755
---- a/modules.d/95nfs/module-setup.sh
-+++ b/modules.d/95nfs/module-setup.sh
-@@ -62,12 +62,8 @@ install() {
-
- # 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
-- egrep '^nfsnobody:' /etc/passwd >> "$initdir/etc/passwd"
-- egrep '^rpc:' /etc/passwd >> "$initdir/etc/passwd"
-- egrep '^rpcuser:' /etc/passwd >> "$initdir/etc/passwd"
-- #type -P nologin >/dev/null && dracut_install nologin
-- egrep '^nobody:' /etc/group >> "$initdir/etc/group"
-- egrep '^rpc:' /etc/group >> "$initdir/etc/group"
-+ egrep '^nfsnobody:|^rpc:|^rpcuser:' /etc/passwd >> "$initdir/etc/passwd"
-+ egrep '^nogroup:|^rpc:|^nobody:' /etc/group >> "$initdir/etc/group"
-
- # rpc user needs to be able to write to this directory to save the warmstart
- # file
diff --git a/0011-dracut-functions.sh-make-use-of-findmnt.patch b/0011-dracut-functions.sh-make-use-of-findmnt.patch
deleted file mode 100644
index 7a1d930..0000000
--- a/0011-dracut-functions.sh-make-use-of-findmnt.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 9d36d4fb1d0774d9ef0597abb79390e88771bf1e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 9 Apr 2013 10:47:39 +0200
-Subject: [PATCH] dracut-functions.sh: make use of findmnt
-
----
- dracut-functions.sh | 163 +++++++++++++++++++++-------------------------------
- 1 file changed, 64 insertions(+), 99 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index eba7412..96d3c6e 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -319,131 +319,96 @@ get_maj_min() {
- # $ find_block_device /usr
- # 8:4
- find_block_device() {
-- local _x _mpt _majmin _dev _fs _maj _min _find_mpt
-+ local _majmin _dev _majmin _find_mpt
- _find_mpt="$1"
- if [[ $use_fstab != yes ]]; then
-- while read _x; do
-- set -- $_x
-- _majmin="$3"
-- _mpt="$5"
-- [[ $8 = "-" ]] && shift
-- _fs="$8"
-- _dev="$9"
-- [[ $_mpt = $_find_mpt ]] || continue
-- [[ $_fs = nfs ]] && { echo $_dev; return 0;}
-- [[ $_fs = nfs3 ]] && { echo $_dev; return 0;}
-- [[ $_fs = nfs4 ]] && { echo $_dev; return 0;}
-- [[ $_fs = btrfs ]] && {
-- get_maj_min $_dev
-- return 0;
-- }
-- if [[ ${_majmin#0:} = $_majmin ]]; then
-- echo $_majmin
-- return 0 # we have a winner!
-+ [[ -d $_find_mpt/. ]]
-+ while read _majmin _dev; do
-+ if [[ -b $_dev ]]; then
-+ if ! [[ $_majmin ]] || [[ $_majmin == 0:* ]]; then
-+ read _majmin < <(get_maj_min $_dev)
-+ fi
-+ if [[ $_majmin ]]; then
-+ echo $_majmin
-+ else
-+ echo $_dev
-+ fi
-+ return 0
-+ fi
-+ if [[ $_dev = *:* ]]; then
-+ echo $_dev
-+ return 0
- fi
-- done < /proc/self/mountinfo
-+ done < <(findmnt -e -v -n -o 'MAJ:MIN,SOURCE' "$_find_mpt")
- fi
- # fall back to /etc/fstab
-- while read _dev _mpt _fs _x; do
-- [ "${_dev%%#*}" != "$_dev" ] && continue
--
-- if [[ $_mpt = $_find_mpt ]]; then
-- [[ $_fs = nfs ]] && { echo $_dev; return 0;}
-- [[ $_fs = nfs3 ]] && { echo $_dev; return 0;}
-- [[ $_fs = nfs4 ]] && { echo $_dev; return 0;}
-- [[ $_dev != ${_dev#UUID=} ]] && _dev=/dev/disk/by-uuid/${_dev#UUID=}
-- [[ $_dev != ${_dev#LABEL=} ]] && _dev=/dev/disk/by-label/${_dev#LABEL=}
-- [[ -b $_dev ]] || return 1 # oops, not a block device.
-- get_maj_min "$_dev" && return 0
-+
-+ while read _majmin _dev; do
-+ if ! [[ $_dev ]]; then
-+ _dev="$_majmin"
-+ unset _majmin
-+ fi
-+ if [[ -b $_dev ]]; then
-+ [[ $_majmin ]] || read _majmin < <(get_maj_min $_dev)
-+ if [[ $_majmin ]]; then
-+ echo $_majmin
-+ else
-+ echo $_dev
-+ fi
-+ return 0
-+ fi
-+ if [[ $_dev = *:* ]]; then
-+ echo $_dev
-+ return 0
- fi
-- done < /etc/fstab
-+ done < <(findmnt -e --fstab -v -n -o 'MAJ:MIN,SOURCE' "$_find_mpt")
-
- return 1
- }
-
--# find_dev_fstype <device>
--# Echo the filesystem type for a given device.
-+# find_mp_fstype <mountpoint>
-+# Echo the filesystem type for a given mountpoint.
- # /proc/self/mountinfo is taken as the primary source of information
- # and /etc/fstab is used as a fallback.
- # No newline is appended!
- # Example:
--# $ find_dev_fstype /dev/sda2;echo
-+# $ find_mp_fstype /;echo
- # ext4
--find_dev_fstype() {
-- local _x _mpt _majmin _dev _fs _maj _min _find_dev
-- _find_dev="$1"
-- strstr "$_find_dev" "/dev" || _find_dev="/dev/block/$_find_dev"
-- while read _x; do
-- set -- $_x
-- _majmin="$3"
-- _mpt="$5"
-- [[ $8 = "-" ]] && shift
-- _fs="$8"
-- _dev="$9"
-- strstr "$_dev" "/dev" || continue
-- [[ $_dev -ef $_find_dev ]] || continue
-- [[ $_fs = "autofs" ]] && continue
-- echo -n $_fs;
-- return 0;
-- done < /proc/self/mountinfo
-+find_mp_fstype() {
-+ local _fs
-
-- # fall back to /etc/fstab
-- while read _dev _mpt _fs _x; do
-- [ "${_dev%%#*}" != "$_dev" ] && continue
-- case "$_dev" in
-- LABEL=*)
-- _dev="$(echo $_dev | sed 's,/,\\x2f,g')"
-- _dev="/dev/disk/by-label/${_dev#LABEL=}"
-- ;;
-- UUID=*)
-- _dev="/dev/disk/by-uuid/${_dev#UUID=}"
-- ;;
-- PARTUUID=*)
-- _dev="/dev/disk/by-partuuid/${_dev#PARTUUID=}"
-- ;;
-- esac
-+ if [[ $use_fstab != yes ]]; then
-+ while read _fs; do
-+ [[ $_fs ]] || continue
-+ [[ $_fs = "autofs" ]] && continue
-+ echo -n $_fs
-+ return 0
-+ done < <(findmnt -e -v -n -o 'FSTYPE' "$1")
-+ fi
-
-- [[ $_dev -ef $_find_dev ]] || continue
-- echo -n $_fs;
-- return 0;
-- done < /etc/fstab
-+ while read _fs; do
-+ [[ $_fs ]] || continue
-+ [[ $_fs = "autofs" ]] && continue
-+ echo -n $_fs
-+ return 0
-+ done < <(findmnt --fstab -e -v -n -o 'FSTYPE' "$1")
-
- return 1
- }
-
--# find_mp_fstype <mountpoint>
--# Echo the filesystem type for a given mountpoint.
-+# find_dev_fstype <device>
-+# Echo the filesystem type for a given device.
- # /proc/self/mountinfo is taken as the primary source of information
- # and /etc/fstab is used as a fallback.
- # No newline is appended!
- # Example:
--# $ find_mp_fstype /;echo
-+# $ find_dev_fstype /dev/sda2;echo
- # ext4
--find_mp_fstype() {
-- local _x _mpt _majmin _dev _fs _maj _min _find_mpt
-- _find_mpt="$1"
-- while read _x; do
-- set -- $_x
-- _majmin="$3"
-- _mpt="$5"
-- [[ $8 = "-" ]] && shift
-- _fs="$8"
-- _dev="$9"
-- [[ $_mpt = $_find_mpt ]] || continue
-- [[ $_fs = "autofs" ]] && continue
-- echo -n $_fs;
-- return 0;
-- done < /proc/self/mountinfo
--
-- # fall back to /etc/fstab
-- while read _dev _mpt _fs _x; do
-- [ "${_dev%%#*}" != "$_dev" ] && continue
-- [[ $_mpt = $_find_mpt ]] || continue
-- echo -n $_fs;
-- return 0;
-- done < /etc/fstab
--
-- return 1
-+find_dev_fstype() {
-+ local _x _mpt _majmin _dev _fs _maj _min _find_dev
-+ _find_dev="$1"
-+ [[ "$_find_dev" = /dev* ]] || _find_dev="/dev/block/$_find_dev"
-+ find_mp_fstype "$_find_dev"
- }
-
- # finds the major:minor of the block device backing the root filesystem.
diff --git a/0012-crypt-module-setup.sh-filter-etc-crypttab-in-host-on.patch b/0012-crypt-module-setup.sh-filter-etc-crypttab-in-host-on.patch
deleted file mode 100644
index 698a708..0000000
--- a/0012-crypt-module-setup.sh-filter-etc-crypttab-in-host-on.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 96efbc51acd7f65f0f254b17d87da7d0465032c1 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 9 Apr 2013 10:48:26 +0200
-Subject: [PATCH] crypt/module-setup.sh: filter /etc/crypttab in host-only mode
-
-only take those /etc/crypttab entries, which we need to boot the system
----
- modules.d/90crypt/module-setup.sh | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index b76f6ae..3c9a1f1 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -56,7 +56,22 @@ install() {
- if ! dracut_module_included "systemd"; then
- inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
- fi
-- [[ $hostonly ]] && inst_simple /etc/crypttab
-+
-+ if [[ $hostonly ]]; then
-+ # filter /etc/crypttab for the devices we need
-+ while read _mapper _dev _rest; do
-+ [[ $_mapper = \#* ]] && continue
-+ [[ $_dev ]] || continue
-+ for _hdev in "${!host_fs_types[@]}"; do
-+ [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue
-+ if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then
-+ echo "$_mapper $_dev $_rest"
-+ break
-+ fi
-+ done
-+ done < /etc/crypttab > $initdir/etc/crypttab
-+ fi
-+
- inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
-
- dracut_install -o \
diff --git a/0013-ifup.sh-Add-support-for-bridge-over-team-and-vlan-ta.patch b/0013-ifup.sh-Add-support-for-bridge-over-team-and-vlan-ta.patch
deleted file mode 100644
index eaee22e..0000000
--- a/0013-ifup.sh-Add-support-for-bridge-over-team-and-vlan-ta.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a55f910cf6f13e1a6d9d5be769297ee3ecc64bb9 Mon Sep 17 00:00:00 2001
-From: WANG Chao <chaowang@redhat.com>
-Date: Mon, 1 Apr 2013 20:34:40 +0800
-Subject: [PATCH] ifup.sh: Add support for bridge over team and vlan tagged
- team
-
-Team is the same network stack as bonding. Therefore give ifup the ability to
-handle bridge over team and vlan tagged team as bonding too.
-
-Signed-off-by: WANG Chao <chaowang@redhat.com>
----
- modules.d/40network/ifup.sh | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 582278f..815ab64 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -46,6 +46,8 @@ if [ -e /tmp/bridge.info ]; then
- if [ "$netif" = "$ethname" ]; then
- if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
- : # We need to really setup bond (recursive call)
-+ elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
-+ : # We need to really setup team (recursive call)
- else
- netif="$bridgename"
- use_bridge='true'
-@@ -59,6 +61,8 @@ if [ -e /tmp/vlan.info ]; then
- if [ "$netif" = "$phydevice" ]; then
- if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
- : # We need to really setup bond (recursive call)
-+ elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
-+ : # We need to really setup team (recursive call)
- else
- netif="$vlanname"
- use_vlan='true'
-@@ -212,6 +216,8 @@ if [ -e /tmp/bridge.info ]; then
- for ethname in $ethnames ; do
- if [ "$ethname" = "$bondname" ] ; then
- DO_BOND_SETUP=yes ifup $bondname -m
-+ elif [ "$ethname" = "$teammaster" ] ; then
-+ DO_TEAM_SETUP=yes ifup $teammaster -m
- else
- linkup $ethname
- fi
-@@ -235,6 +241,8 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
- modprobe 8021q
- if [ "$phydevice" = "$bondname" ] ; then
- DO_BOND_SETUP=yes ifup $phydevice -m
-+ elif [ "$phydevice" = "$teammaster" ] ; then
-+ DO_TEAM_SETUP=yes ifup $phydevice -m
- else
- linkup "$phydevice"
- fi
diff --git a/0014-network-support-multiple-bonding-interfaces.patch b/0014-network-support-multiple-bonding-interfaces.patch
deleted file mode 100644
index ff58293..0000000
--- a/0014-network-support-multiple-bonding-interfaces.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From d136ca4eeb3d7be2beef210dcf51a18210900844 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 8 Apr 2013 17:47:49 +0800
-Subject: [PATCH] network: support multiple bonding interfaces
-
-Currently dracut only support 1 bond, namyly bond0 by default. However multiple
-bonds configuration may be needed. For example in kdump, in 1st kernel, more
-than one bonds may be configured, and bondX other than bond0 is used as output
-interface to remote host which will store dump core. This patch can solve this
-problem, to write real bond information to initramfs, 2nd kdump kernel will
-use it to create the relevant bondX interface.
-
-Tested-by: Baoquan He <bhe@redhat.com>
-Signed-off-by: Baoquan He <bhe@redhat.com>
----
- modules.d/40network/ifup.sh | 15 ++++++++++-----
- modules.d/40network/net-genrules.sh | 9 ++++++---
- modules.d/40network/parse-bond.sh | 6 +++---
- modules.d/40network/parse-bridge.sh | 6 ------
- modules.d/45ifcfg/write-ifcfg.sh | 9 +++++----
- 5 files changed, 24 insertions(+), 21 deletions(-)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 815ab64..593f387 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -21,14 +21,18 @@ use_bridge='false'
- use_vlan='false'
-
- # enslave this interface to bond?
--if [ -e /tmp/bond.info ]; then
-- . /tmp/bond.info
-+for i in /tmp/bond.*.info; do
-+ [ -e "$i" ] || continue
-+ unset bondslaves
-+ unset bondname
-+ . "$i"
- for slave in $bondslaves ; do
- if [ "$netif" = "$slave" ] ; then
- netif=$bondname
-+ break 2
- fi
- done
--fi
-+done
-
- if [ -e /tmp/team.info ]; then
- . /tmp/team.info
-@@ -138,11 +142,12 @@ if [ "$netif" = "lo" ] ; then
- fi
-
- # start bond if needed
--if [ -e /tmp/bond.info ]; then
-- . /tmp/bond.info
-+if [ -e /tmp/bond.${netif}.info ]; then
-+ . /tmp/bond.${netif}.info
-
- if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
- modprobe bonding
-+ echo "+$netif" > /sys/class/net/bonding_masters
- ip link set $netif down
-
- # Stolen from ifup-eth
-diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
-index f4652b9..05fa5f3 100755
---- a/modules.d/40network/net-genrules.sh
-+++ b/modules.d/40network/net-genrules.sh
-@@ -28,11 +28,14 @@ fi
- fi
-
- # bond: attempt only the defined interface (override bridge defines)
-- if [ -e /tmp/bond.info ]; then
-- . /tmp/bond.info
-+ for i in /tmp/bond.*.info; do
-+ [ -e "$i" ] || continue
-+ unset bondslaves
-+ unset bondname
-+ . "$i"
- # It is enough to fire up only one
- IFACES="$IFACES ${bondslaves%% *}"
-- fi
-+ done
-
- if [ -e /tmp/team.info ]; then
- . /tmp/team.info
-diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh
-index 983eb3a..25c51b8 100755
---- a/modules.d/40network/parse-bond.sh
-+++ b/modules.d/40network/parse-bond.sh
-@@ -54,8 +54,8 @@ if getarg bond >/dev/null; then
- fi
- # Make it suitable for initscripts export
- bondoptions=$(str_replace "$bondoptions" ";" ",")
-- echo "bondname=$bondname" > /tmp/bond.info
-- echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.info
-- echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.info
-+ echo "bondname=$bondname" > /tmp/bond.${bondname}.info
-+ echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.${bondname}.info
-+ echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.${bondname}.info
- return
- fi
-diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh
-index 1f027bb..8c305c0 100755
---- a/modules.d/40network/parse-bridge.sh
-+++ b/modules.d/40network/parse-bridge.sh
-@@ -37,12 +37,6 @@ parsebridge() {
- unset bridgename ethnames
-
- iface=eth0
--if [ -e /tmp/bond.info ]; then
-- . /tmp/bond.info
-- if [ -n "$bondname" ] ; then
-- iface=$bondname
-- fi
--fi
-
- # Parse bridge for bridgename and ethnames
- if bridge="$(getarg bridge)"; then
-diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
-index f7a476c..16da5e4 100755
---- a/modules.d/45ifcfg/write-ifcfg.sh
-+++ b/modules.d/45ifcfg/write-ifcfg.sh
-@@ -9,10 +9,6 @@ udevadm settle --timeout=30
-
- read IFACES < /tmp/net.ifaces
-
--if [ -e /tmp/bond.info ]; then
-- . /tmp/bond.info
--fi
--
- if [ -e /tmp/bridge.info ]; then
- . /tmp/bridge.info
- fi
-@@ -89,6 +85,11 @@ for netif in $IFACES ; do
- # bridge?
- unset bridge
- unset bond
-+ unset bondslaves
-+ unset bondname
-+ unset bondoptions
-+ [ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info
-+
- uuid=$(cat /proc/sys/kernel/random/uuid)
- if [ "$netif" = "$bridgename" ]; then
- bridge=yes
diff --git a/0015-Wait-for-logical-interface-to-be-up.patch b/0015-Wait-for-logical-interface-to-be-up.patch
deleted file mode 100644
index e90e32f..0000000
--- a/0015-Wait-for-logical-interface-to-be-up.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0290e98271af41423e16801b959779c945ee4d59 Mon Sep 17 00:00:00 2001
-From: Baoquan He <bhe@redhat.com>
-Date: Mon, 8 Apr 2013 17:47:50 +0800
-Subject: [PATCH] Wait for logical interface to be up
-
-If bootdev is logical interface like bond, bridge or vlan, we need
-wait them up.
-
-Signed-off-by: Baoquan He <bhe@redhat.com>
----
- modules.d/40network/net-genrules.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
-index 05fa5f3..8bf6a89 100755
---- a/modules.d/40network/net-genrules.sh
-+++ b/modules.d/40network/net-genrules.sh
-@@ -25,6 +25,7 @@ fi
- if [ -e /tmp/bridge.info ]; then
- . /tmp/bridge.info
- IFACES="$IFACES ${ethnames%% *}"
-+ MASTER_IFACES="$MASTER_IFACES $bridgename"
- fi
-
- # bond: attempt only the defined interface (override bridge defines)
-@@ -35,16 +36,19 @@ fi
- . "$i"
- # It is enough to fire up only one
- IFACES="$IFACES ${bondslaves%% *}"
-+ MASTER_IFACES="$MASTER_IFACES ${bondname}"
- done
-
- if [ -e /tmp/team.info ]; then
- . /tmp/team.info
- IFACES="$IFACES ${teamslaves}"
-+ MASTER_IFACES="$MASTER_IFACES ${teammaster}"
- fi
-
- if [ -e /tmp/vlan.info ]; then
- . /tmp/vlan.info
- IFACES="$IFACES $phydevice"
-+ MASTER_IFACES="$MASTER_IFACES ${vlanname}"
- fi
-
- if [ -z "$IFACES" ]; then
-@@ -74,6 +78,11 @@ fi
- fi
- done
-
-+ for iface in $MASTER_IFACES; do
-+ if [ "$bootdev" = "$iface" ]; then
-+ echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
-+ fi
-+ done
- # Default: We don't know the interface to use, handle all
- # Fixme: waiting for the interface as well.
- else
diff --git a/0016-Let-user-specify-the-action-after-fail.patch b/0016-Let-user-specify-the-action-after-fail.patch
deleted file mode 100644
index 0d367b6..0000000
--- a/0016-Let-user-specify-the-action-after-fail.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 9d787df19674937e8c07bd295b5d282a63829209 Mon Sep 17 00:00:00 2001
-From: Baoquan He <bhe@redhat.com>
-Date: Fri, 29 Mar 2013 18:36:16 +0800
-Subject: [PATCH] Let user specify the action after fail
-
-Currently the default action is emergency_shell when failure happened
-during system boot. In kdump, this default may not be expected. E.g,
-if dump target is not rootfs, it does not matter if mount root failed.
-Adding an action which allow dracut always go ahead though failure
-happens is needed by kdump.
-
-So here add a function action_on_fail() and cmdline parameter
-action_on_fail=<shell | continue>. Use action_to_fail() to replace
-emergency_shell which was called after failure. By $(getarg action_on_fail=),
-decide to drop into shell, or to leave away the failure and go ahead.
-
-v3->v4:
-add handling of selinux policy loaded failure, and change code format to
-be consitent
-
-Signed-off-by: Baoquan He <bhe@redhat.com>
-
-[Edited by harald@redhat.com]
----
- dracut.cmdline.7.asc | 4 ++++
- modules.d/95rootfs-block/mount-root.sh | 2 +-
- modules.d/98selinux/selinux-loadpolicy.sh | 6 ++----
- modules.d/98systemd/dracut-initqueue.sh | 2 +-
- modules.d/98systemd/dracut-mount.sh | 2 +-
- modules.d/98usrmount/mount-usr.sh | 4 ++--
- modules.d/99base/dracut-lib.sh | 22 ++++++++++++++++++++++
- modules.d/99base/init.sh | 12 ++++++------
- 8 files changed, 39 insertions(+), 15 deletions(-)
-
-diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
-index f1457d5..4626279 100644
---- a/dracut.cmdline.7.asc
-+++ b/dracut.cmdline.7.asc
-@@ -121,6 +121,10 @@ Misc
- specify the controlling terminal for the console.
- This is useful, if you have multiple "console=" arguments.
-
-+**action_on_fail=**_{shell|continue}_::
-+ Specify the action after failure. By default it's emergency_shell.
-+ 'continue' means: ignore the current failure and go ahead.
-+
- [[dracutkerneldebug]]
- Debug
- ~~~~~
-diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
-index c7626c3..6ed35c1 100755
---- a/modules.d/95rootfs-block/mount-root.sh
-+++ b/modules.d/95rootfs-block/mount-root.sh
-@@ -68,7 +68,7 @@ mount_root() {
- warn "*** Warning -- the system did not shut down cleanly. "
- warn "*** Dropping you to a shell; the system will continue"
- warn "*** when you leave the shell."
-- emergency_shell
-+ action_on_fail
- fi
- fsckoptions="$AUTOFSCK_OPT $fsckoptions"
- fi
-diff --git a/modules.d/98selinux/selinux-loadpolicy.sh b/modules.d/98selinux/selinux-loadpolicy.sh
-index d6e24d6..7526265 100755
---- a/modules.d/98selinux/selinux-loadpolicy.sh
-+++ b/modules.d/98selinux/selinux-loadpolicy.sh
-@@ -52,16 +52,14 @@ rd_load_policy()
- if [ $ret -eq 3 -o $permissive -eq 0 ]; then
- warn "Machine in enforcing mode."
- warn "Not continuing"
-- emergency_shell -n selinux
-- exit 1
-+ action_on_fail -n selinux || exit 1
- fi
- return 0
- elif [ $permissive -eq 0 -a "$SELINUX" != "disabled" ]; then
- warn "Machine in enforcing mode and cannot execute load_policy."
- warn "To disable selinux, add selinux=0 to the kernel command line."
- warn "Not continuing"
-- emergency_shell -n selinux
-- exit 1
-+ action_on_fail -n selinux || exit 1
- fi
- }
-
-diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
-index c6fab30..2c71bf4 100755
---- a/modules.d/98systemd/dracut-initqueue.sh
-+++ b/modules.d/98systemd/dracut-initqueue.sh
-@@ -62,7 +62,7 @@ while :; do
- fi
-
- main_loop=$(($main_loop+1))
-- [ $main_loop -gt $RDRETRY ] && emergency_shell "Could not boot."
-+ [ $main_loop -gt $RDRETRY ] && action_on_fail "Could not boot." && break
- done
-
- unset job
-diff --git a/modules.d/98systemd/dracut-mount.sh b/modules.d/98systemd/dracut-mount.sh
-index 5f3d9f0..ae01512 100755
---- a/modules.d/98systemd/dracut-mount.sh
-+++ b/modules.d/98systemd/dracut-mount.sh
-@@ -31,7 +31,7 @@ while :; do
- done
-
- i=$(($i+1))
-- [ $i -gt 20 ] && emergency_shell "Can't mount root filesystem"
-+ [ $i -gt 20 ] && action_on_fail "Can't mount root filesystem" && break
- done
-
- export -p > /dracut-state.sh
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index 5aaefbc..a4a66ae 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -42,7 +42,7 @@ fsck_usr()
- warn "*** Warning -- the system did not shut down cleanly. "
- warn "*** Dropping you to a shell; the system will continue"
- warn "*** when you leave the shell."
-- emergency_shell
-+ action_on_fail
- fi
- _fsckoptions="$AUTOFSCK_OPT $_fsckoptions"
- fi
-@@ -105,7 +105,7 @@ mount_usr()
- warn "Mounting /usr to $NEWROOT/usr failed"
- warn "*** Dropping you to a shell; the system will continue"
- warn "*** when you leave the shell."
-- emergency_shell
-+ action_on_fail
- fi
- fi
- }
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index f2b16d3..1defb6f 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -994,6 +994,28 @@ emergency_shell()
- [ -e /run/initramfs/.die ] && exit 1
- }
-
-+action_on_fail()
-+{
-+ local _action=$(getarg action_on_fail=)
-+ case "$_action" in
-+ continue)
-+ [ "$1" = "-n" ] && shift 2
-+ [ "$1" = "--shutdown" ] && shift 2
-+ warn "$*"
-+ warn "Not dropping to emergency shell, because 'action_on_fail=continue' was set on the kernel command line."
-+ return 0
-+ ;;
-+ shell)
-+ emergency_shell $@
-+ return 1
-+ ;;
-+ *)
-+ emergency_shell $@
-+ return 1
-+ ;;
-+ esac
-+}
-+
- # Retain the values of these variables but ensure that they are unexported
- # This is a POSIX-compliant equivalent of bash's "export -n"
- export_n()
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 410201a..880a2c0 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -79,7 +79,7 @@ if ! ismounted /run; then
- rm -fr /newrun
- fi
-
--trap "emergency_shell Signal caught!" 0
-+trap "action_on_fail Signal caught!" 0
-
- [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
- [ -d /run/log ] || mkdir -p -m 0755 /run/log
-@@ -199,7 +199,7 @@ while :; do
-
- main_loop=$(($main_loop+1))
- [ $main_loop -gt $RDRETRY ] \
-- && { flock -s 9 ; emergency_shell "Could not boot."; } 9>/.console_lock
-+ && { flock -s 9 ; action_on_fail "Could not boot." && break; } 9>/.console_lock
- done
- unset job
- unset queuetriggered
-@@ -234,7 +234,7 @@ while :; do
-
- i=$(($i+1))
- [ $i -gt 20 ] \
-- && { flock -s 9 ; emergency_shell "Can't mount root filesystem"; } 9>/.console_lock
-+ && { flock -s 9 ; action_on_fail "Can't mount root filesystem" && break; } 9>/.console_lock
- done
-
- {
-@@ -268,7 +268,7 @@ done
- [ "$INIT" ] || {
- echo "Cannot find init!"
- echo "Please check to make sure you passed a valid root filesystem!"
-- emergency_shell
-+ action_on_fail
- }
-
- if [ $UDEVVERSION -lt 168 ]; then
-@@ -370,13 +370,13 @@ if [ -f /etc/capsdrop ]; then
- warn "Command:"
- warn capsh --drop=$CAPS_INIT_DROP -- -c exec switch_root "$NEWROOT" "$INIT" $initargs
- warn "failed."
-- emergency_shell
-+ action_on_fail
- }
- else
- unset RD_DEBUG
- exec $SWITCH_ROOT "$NEWROOT" "$INIT" $initargs || {
- warn "Something went very badly wrong in the initramfs. Please "
- warn "file a bug against dracut."
-- emergency_shell
-+ action_on_fail
- }
- fi
diff --git a/0017-ifup.sh-Add-support-for-bridge-over-a-vlan-tagged-in.patch b/0017-ifup.sh-Add-support-for-bridge-over-a-vlan-tagged-in.patch
deleted file mode 100644
index 37df88b..0000000
--- a/0017-ifup.sh-Add-support-for-bridge-over-a-vlan-tagged-in.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 0c5ccb35c7db77caf6317e1946387504b44132e5 Mon Sep 17 00:00:00 2001
-From: WANG Chao <chaowang@redhat.com>
-Date: Tue, 9 Apr 2013 18:56:40 +0800
-Subject: [PATCH] ifup.sh: Add support for bridge over a vlan tagged interface
-
-This patch add support for bridge a vlan tagged interface, like
-br0 -> bond0.7 -> bond0 -> eth0
-
-Signed-off-by: WANG Chao <chaowang@redhat.com>
----
- modules.d/40network/ifup.sh | 33 +++++++++++++++++++--------------
- 1 file changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 593f387..526251f 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -43,6 +43,20 @@ if [ -e /tmp/team.info ]; then
- done
- fi
-
-+if [ -e /tmp/vlan.info ]; then
-+ . /tmp/vlan.info
-+ if [ "$netif" = "$phydevice" ]; then
-+ if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
-+ : # We need to really setup bond (recursive call)
-+ elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
-+ : # We need to really setup team (recursive call)
-+ else
-+ netif="$vlanname"
-+ use_vlan='true'
-+ fi
-+ fi
-+fi
-+
- # bridge this interface?
- if [ -e /tmp/bridge.info ]; then
- . /tmp/bridge.info
-@@ -52,6 +66,8 @@ if [ -e /tmp/bridge.info ]; then
- : # We need to really setup bond (recursive call)
- elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
- : # We need to really setup team (recursive call)
-+ elif [ "$netif" = "$vlanname" ] && [ -n "$DO_VLAN_SETUP" ]; then
-+ : # We need to really setup vlan (recursive call)
- else
- netif="$bridgename"
- use_bridge='true'
-@@ -60,20 +76,6 @@ if [ -e /tmp/bridge.info ]; then
- done
- fi
-
--if [ -e /tmp/vlan.info ]; then
-- . /tmp/vlan.info
-- if [ "$netif" = "$phydevice" ]; then
-- if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
-- : # We need to really setup bond (recursive call)
-- elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
-- : # We need to really setup team (recursive call)
-- else
-- netif="$vlanname"
-- use_vlan='true'
-- fi
-- fi
--fi
--
- # disable manual ifup while netroot is set for simplifying our logic
- # in netroot case we prefer netroot to bringup $netif automaticlly
- [ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
-@@ -223,6 +225,8 @@ if [ -e /tmp/bridge.info ]; then
- DO_BOND_SETUP=yes ifup $bondname -m
- elif [ "$ethname" = "$teammaster" ] ; then
- DO_TEAM_SETUP=yes ifup $teammaster -m
-+ elif [ "$ethname" = "$vlanname" ]; then
-+ DO_VLAN_SETUP=yes ifup $vlanname -m
- else
- linkup $ethname
- fi
-@@ -252,6 +256,7 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
- linkup "$phydevice"
- fi
- ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname)"
-+ ip link set "$vlanname" up
- fi
-
- # setup nameserver
diff --git a/0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch b/0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch
deleted file mode 100644
index 0fd2982..0000000
--- a/0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cdcb27a4fee4400581becec37e862c461332cb50 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 10 Apr 2013 10:15:43 +0200
-Subject: [PATCH] crypt/module-setup.sh: also handle UUID= while filtering
- crypttab
-
-The crypttab filter for host-only did not handle UUID= entries.
-https://bugzilla.redhat.com/show_bug.cgi?id=919752
----
- modules.d/90crypt/module-setup.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 3c9a1f1..639a77f 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -62,6 +62,10 @@ install() {
- while read _mapper _dev _rest; do
- [[ $_mapper = \#* ]] && continue
- [[ $_dev ]] || continue
-+
-+ [[ $_dev == UUID=* ]] && \
-+ _dev="/dev/disk/by-uuid/${_dev#UUID=}"
-+
- for _hdev in "${!host_fs_types[@]}"; do
- [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue
- if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then
diff --git a/0019-Do-not-call-plymouth-with-full-path.patch b/0019-Do-not-call-plymouth-with-full-path.patch
deleted file mode 100644
index cd7a031..0000000
--- a/0019-Do-not-call-plymouth-with-full-path.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From ca2c6936798b3931fb4806d783c17474b8f89878 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 16:08:26 +0200
-Subject: [PATCH] Do not call plymouth with full path
-
----
- modules.d/50plymouth/module-setup.sh | 2 +-
- modules.d/50plymouth/plymouth-emergency.sh | 2 +-
- modules.d/50plymouth/plymouth-newroot.sh | 4 ++--
- modules.d/50plymouth/plymouth-populate-initrd.sh | 5 ++---
- modules.d/50plymouth/plymouth-pretrigger.sh | 6 +++---
- modules.d/90crypt/crypt-lib.sh | 4 ++--
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 4 ++--
- modules.d/98systemd/dracut-emergency.sh | 2 +-
- modules.d/99base/dracut-lib.sh | 4 ++--
- 9 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
-index f754e24..ae35b11 100755
---- a/modules.d/50plymouth/module-setup.sh
-+++ b/modules.d/50plymouth/module-setup.sh
-@@ -4,7 +4,7 @@
-
- check() {
- [[ "$mount_needs" ]] && return 1
-- [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
-+ type -P plymouthd >/dev/null && type -P plymouth >/dev/null
- }
-
- depends() {
-diff --git a/modules.d/50plymouth/plymouth-emergency.sh b/modules.d/50plymouth/plymouth-emergency.sh
-index 68955b8..ed0b0ac 100755
---- a/modules.d/50plymouth/plymouth-emergency.sh
-+++ b/modules.d/50plymouth/plymouth-emergency.sh
-@@ -1,4 +1,4 @@
- #!/bin/sh
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
--[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-+plymouth --hide-splash 2>/dev/null || :
-diff --git a/modules.d/50plymouth/plymouth-newroot.sh b/modules.d/50plymouth/plymouth-newroot.sh
-index 2311b47..96cd138 100755
---- a/modules.d/50plymouth/plymouth-newroot.sh
-+++ b/modules.d/50plymouth/plymouth-newroot.sh
-@@ -2,6 +2,6 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
-
--if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
-- /bin/plymouth --newroot=$NEWROOT
-+if type plymouth >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
-+ plymouth --newroot=$NEWROOT
- fi
-diff --git a/modules.d/50plymouth/plymouth-populate-initrd.sh b/modules.d/50plymouth/plymouth-populate-initrd.sh
-index 1e2ffe7..6e0f561 100755
---- a/modules.d/50plymouth/plymouth-populate-initrd.sh
-+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
-@@ -4,15 +4,14 @@
- PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
- PLYMOUTH_THEME=$(plymouth-set-default-theme)
-
--inst /sbin/plymouthd /bin/plymouthd
--dracut_install /bin/plymouth \
-+dracut_install plymouthd plymouth \
- "${PLYMOUTH_LOGO_FILE}" \
- /etc/system-release
-
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
-
- inst_libdir_file "plymouth/text.so" "plymouth/details.so"
--
-+
- if [[ $hostonly ]]; then
- dracut_install \
- "/usr/share/plymouth/themes/details/details.plymouth" \
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 0e3cb02..8087bf6 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
-
--if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
-+if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
- if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
- # first trigger graphics subsystem
- udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
-@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
- read consoledev rest < /sys/class/tty/console/active
- consoledev=${consoledev:-tty0}
- [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
-- [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
-- /bin/plymouth --show-splash 2>&1 | vinfo
-+ plymouthd --attach-to-session --pid-file /run/plymouth/pid
-+ plymouth --show-splash 2>&1 | vinfo
- # reset tty after plymouth messed with it
- [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
- fi
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
-index d66ba88..ebe09f8 100755
---- a/modules.d/90crypt/crypt-lib.sh
-+++ b/modules.d/90crypt/crypt-lib.sh
-@@ -47,8 +47,8 @@ ask_for_password() {
-
- { flock -s 9;
- # Prompt for password with plymouth, if installed and running.
-- if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
-- /bin/plymouth ask-for-password \
-+ if type plymouth >/dev/null 2>&1 && plymouth --ping 2>/dev/null; then
-+ plymouth ask-for-password \
- --prompt "$ply_prompt" --number-of-tries=$ply_tries \
- --command="$ply_cmd"
- ret=$?
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index a79b0d9..07e41f0 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
- fi
- getarg rd.live.check -d check || check=""
- if [ -n "$check" ]; then
-- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-+ type plymouth >/dev/null 2>&1 && plymouth --hide-splash
- if [ -n "$DRACUT_SYSTEMD" ]; then
- p=$(str_replace "$livedev" "-" '\x2d')
- systemctl start checkisomd5@${p}.service
-@@ -42,7 +42,7 @@ if [ -n "$check" ]; then
- die "CD check failed!"
- exit 1
- fi
-- [ -x /bin/plymouth ] && /bin/plymouth --show-splash
-+ type plymouth >/dev/null 2>&1 && plymouth --show-splash
- fi
-
- ln -s $livedev /run/initramfs/livedev
-diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh
-index a0a4b12..8ab045e 100755
---- a/modules.d/98systemd/dracut-emergency.sh
-+++ b/modules.d/98systemd/dracut-emergency.sh
-@@ -10,7 +10,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
- source_conf /etc/conf.d
-
--[ -x /bin/plymouth ] && /bin/plymouth quit
-+type plymouth >/dev/null 2>&1 && plymouth quit
-
- export _rdshell_name="dracut" action="Boot" hook="emergency"
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 1defb6f..9f4b2d2 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -971,8 +971,8 @@ emergency_shell()
- shift 2
- elif [ "$1" = "--shutdown" ]; then
- _rdshell_name=$2; action="Shutdown"; hook="shutdown-emergency"
-- if [ -x /bin/plymouth ]; then
-- /bin/plymouth --hide-splash
-+ if type plymouth >/dev/null 2>&1; then
-+ plymouth --hide-splash
- elif [ -x /oldroot/bin/plymouth ]; then
- /oldroot/bin/plymouth --hide-splash
- fi
diff --git a/0020-plymouth-plymouth-pretrigger.sh-fixup-of-ca2c6936.patch b/0020-plymouth-plymouth-pretrigger.sh-fixup-of-ca2c6936.patch
deleted file mode 100644
index bdd7e0a..0000000
--- a/0020-plymouth-plymouth-pretrigger.sh-fixup-of-ca2c6936.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a229b17434e86c0f22f32f42e64a585f4090a93f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 12 Apr 2013 15:25:44 +0200
-Subject: [PATCH] plymouth/plymouth-pretrigger.sh: fixup of ca2c6936
-
----
- modules.d/50plymouth/plymouth-pretrigger.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 8087bf6..196f2f9 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
-
--if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
-+if type plymouthd >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
- if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
- # first trigger graphics subsystem
- udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
diff --git a/0021-AUTHORS-update.patch b/0021-AUTHORS-update.patch
deleted file mode 100644
index 6036eb3..0000000
--- a/0021-AUTHORS-update.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 14201d23e7d1dd3b1e6cc7444768c297df03db54 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 10:10:49 +0200
-Subject: [PATCH] AUTHORS: update
-
----
- .mailmap | 27 +++++++++++++++------------
- AUTHORS | 27 ++++++++++++++++++---------
- 2 files changed, 33 insertions(+), 21 deletions(-)
-
-diff --git a/.mailmap b/.mailmap
-index bce9b7c..852f269 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -1,12 +1,15 @@
--Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
--Seewer Philippe <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
--Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
--Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
--Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
--Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
--Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com>
--Amerigo Wang <amwang@redhat.com> <xiyou.wangcong@gmail.com>
--Andrey Borzenkov <arvidjaar@gmail.com> <arvidjaar@mail.ru>
--Dan Horák <dhorak@redhat.com> <dan@danny.cz>
--John Reiser <jreiser@bitwagon.com> <jreiser@BitWagon.com>
--Luca Berra <bluca@vodka.it> <bluca@comedia.it>
-+Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
-+Seewer Philippe <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
-+Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
-+Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-+Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
-+Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
-+Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com>
-+Amerigo Wang <amwang@redhat.com> <xiyou.wangcong@gmail.com>
-+Andrey Borzenkov <arvidjaar@gmail.com> <arvidjaar@mail.ru>
-+Dan Horák <dhorak@redhat.com> <dan@danny.cz>
-+John Reiser <jreiser@bitwagon.com> <jreiser@BitWagon.com>
-+Luca Berra <bluca@vodka.it> <bluca@comedia.it>
-+Dave Young <dyoung@redhat.com> dyoung@redhat.com
-+Frederick Grose <fgrose@sugarlabs.org> <fgrose@gmail.com>
-+Frederic Crozat <fcrozat@suse.com> <fcrozat@mandriva.com>
-diff --git a/AUTHORS b/AUTHORS
-index fa69b91..3512cad 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -6,9 +6,9 @@ Warren Togami <wtogami@redhat.com>
- Will Woods <wwoods@redhat.com>
- Jeremy Katz <katzj@redhat.com>
- David Dillow <dave@thedillows.org>
-+Dave Young <dyoung@redhat.com>
- Michal Soltys <soltys@ziu.info>
- Amerigo Wang <amwang@redhat.com>
--Dave Young <dyoung@redhat.com>
- Colin Guthrie <colin@mageia.org>
- Andrey Borzenkov <arvidjaar@gmail.com>
- Andreas Thienemann <andreas@bawue.net>
-@@ -17,53 +17,61 @@ Peter Jones <pjones@redhat.com>
- John Reiser <jreiser@bitwagon.com>
- Luca Berra <bluca@vodka.it>
- Daniel Drake <dsd@laptop.org>
-+Dan Horák <dhorak@redhat.com>
- Leho Kraav <leho@kraav.com>
- Brian C. Lane <bcl@redhat.com>
- Marc Grimme <grimme@atix.de>
- Chao Wang <chaowang@redhat.com>
--Dan Horák <dhorak@redhat.com>
-+Frederic Crozat <fcrozat@suse.com>
- Jesse Keating <jkeating@redhat.com>
- Milan Broz <mbroz@redhat.com>
- Roberto Sassu <roberto.sassu@polito.it>
--dyoung@redhat.com <dyoung@redhat.com>
- Anton Blanchard <anton@samba.org>
- Bill Nottingham <notting@redhat.com>
- David Cantrell <dcantrell@redhat.com>
--Frederic Crozat <fcrozat@suse.com>
- Jon Ander Hernandez <jonan.h@gmail.com>
- Juan RP <xtraeme@gmail.com>
- Lance Albertson <lance@osuosl.org>
- Marian Ganisin <mganisin@redhat.com>
- Michael Ploujnikov <plouj@somanetworks.com>
- Peter Rajnoha <prajnoha@redhat.com>
-+Radek Vykydal <rvykydal@redhat.com>
-+WANG Chao <chaowang@redhat.com>
-+Wim Muskee <wimmuskee@gmail.com>
- Alan Jenkins <alan-jenkins@tuffmail.co.uk>
- Alan Pevec <apevec@redhat.com>
-+Baoquan He <bhe@redhat.com>
- Colin Walters <walters@verbum.org>
- Dennis Gilmore <dennis@ausil.us>
-+Frederick Grose <fgrose@sugarlabs.org>
- Ian Dall <ian@beware.dropbear.id.au>
- James Buren <ryuo@frugalware.org>
- Joey Boggs <jboggs@redhat.com>
- Mike Snitzer <snitzer@redhat.com>
- Przemysław Rudy <prudy1@o2.pl>
-+Stefan Reimer <it@startux.de>
- Thomas Lange <lange@informatik.uni-koeln.de>
- Vivek Goyal <vgoyal@redhat.com>
- Vladislav Bogdanov <bubble@hoster-ok.com>
--Wim Muskee <wimmuskee@gmail.com>
- Alexander Todorov <atodorov@redhat.com>
- Andy Lutomirski <luto@mit.edu>
- Anssi Hannula <anssi@mageia.org>
- Canek Peláez Valdés <caneko@gmail.com>
- Chris Leech <cleech@redhat.com>
- Christian Heinz <christian.ch.heinz@gmail.com>
-+Cong Wang <amwang@redhat.com>
- Dave Jones <davej@redhat.com>
-+Dave Young <dave@redhat.com>
- Duane Griffin <duaneg@dghda.com>
--Frederic Crozat <fcrozat@mandriva.com>
--Frederick Grose <fgrose@gmail.com>
- Glen Gray <slaine@slaine.org>
- Hermann Gausterer <git-dracut-2012@mrq1.org>
- James Laska <jlaska@redhat.com>
- Jan Stodola <jstodola@redhat.com>
-+Jiri Pirko <jiri@resnulli.us>
-+Joe Lawrence <Joe.Lawrence@stratus.com>
-+Kevin Yung <Kevin.Yung@myob.com>
- Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-+Lars R. Damerow <lars@pixar.com>
- Lennert Buytenhek <buytenh@wantstofly.org>
- Lubomir Rintel <lkundrak@v3.sk>
- Matt <smoothsailing72@hotmail.com>
-@@ -71,17 +79,18 @@ Matt Smith <shadowfax@gmx.com>
- Michal Schmidt <mschmidt@redhat.com>
- Mike Gorse <mgorse@suse.com>
- Munehiro Matsuda <haro@kgt.co.jp>
-+Nicolas Chauvet <kwizart@gmail.com>
- Nikoli <nikoli@lavabit.com>
- Olivier Blin <dev@blino.org>
- Paolo Bonzini <pbonzini@redhat.com>
- Peter Robinson <pbrobinson@fedoraproject.org>
- Pádraig Brady <P@draigBrady.com>
- Quentin Armitage <quentin@armitage.org.uk>
--Radek Vykydal <rvykydal@redhat.com>
-+Robert Buchholz <rbu@goodpoint.de>
- Sergey Fionov <fionov@gmail.com>
- Srinivasa T N <seenutn@linux.vnet.ibm.com>
--Stefan Reimer <it@startux.de>
- Thilo Bangert <thilo.bangert@gmx.net>
-+Thomas Backlund <tmb@mageia.org>
- Tomasz Torcz <tomek@pipebreaker.pl>
- Vadim Kuznetsov <vadimk@gentoo.org>
- Ville Skyttä <ville.skytta@iki.fi>
diff --git a/0022-Makefile-git2spec.pl-use-git-describe.patch b/0022-Makefile-git2spec.pl-use-git-describe.patch
deleted file mode 100644
index df18bf0..0000000
--- a/0022-Makefile-git2spec.pl-use-git-describe.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 5f8cd1a4bececb879b3b597e7751d8093d71a4bc Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 10:11:14 +0200
-Subject: [PATCH] Makefile,git2spec.pl: use "git describe"
-
----
- Makefile | 14 +++++++-------
- git2spec.pl | 19 ++-----------------
- 2 files changed, 9 insertions(+), 24 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 40d44eb..6bda766 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,6 @@
--VERSION=027
--GITVERSION=$(shell [ -d .git ] && git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8)
-+RELEASEDVERSION = -- will be replaced by "make dist" --
-+VERSION = $(shell [ -d .git ] && git describe --abbrev=0 --tags || echo $(RELEASEDVERSION))
-+GITVERSION = $(shell [ -d .git ] && { v=$$(git describe --tags); echo -$${v\#*-}; } )
-
- -include Makefile.inc
-
-@@ -35,7 +36,7 @@ man8pages = dracut.8 \
- manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
-
-
--.PHONY: install clean archive rpm testimage test all check AUTHORS doc
-+.PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
-
- all: syncheck dracut-version.sh dracut-install
-
-@@ -138,7 +139,7 @@ endif
- install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
-
- dracut-version.sh:
-- @echo "DRACUT_VERSION=$(VERSION)-$(GITVERSION)" > dracut-version.sh
-+ @echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh
-
- clean:
- $(RM) *~
-@@ -151,15 +152,14 @@ clean:
- $(RM) $(manpages) dracut.html
- $(MAKE) -C test clean
-
--archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
--
- dist: dracut-$(VERSION).tar.bz2
-
- dracut-$(VERSION).tar.bz2: doc
- git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar
- mkdir -p dracut-$(VERSION)
- cp $(manpages) dracut.html dracut-$(VERSION)
-- tar -rf dracut-$(VERSION).tar dracut-$(VERSION)/*.[0-9] dracut-$(VERSION)/dracut.html
-+ sed 's/^RELEASEDVERSION =.*/RELEASEDVERSION = $(VERSION)/' Makefile > dracut-$(VERSION)/Makefile
-+ tar --owner=root --group=root -rf dracut-$(VERSION).tar dracut-$(VERSION)/*.[0-9] dracut-$(VERSION)/dracut.html dracut-$(VERSION)/Makefile
- rm -fr dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
- bzip2 -9 dracut-$(VERSION).tar
- rm -f dracut-$(VERSION).tar
-diff --git a/git2spec.pl b/git2spec.pl
-index 9f12577..0d8adb4 100755
---- a/git2spec.pl
-+++ b/git2spec.pl
-@@ -1,21 +1,5 @@
- #!/usr/bin/perl
-
--sub last_tag {
-- open( GIT, 'git log --pretty=format:%H |');
-- LINE: while( <GIT> ) {
-- open( GIT2, "git tag --contains $_ |");
-- while( <GIT2> ) {
-- chomp;
-- last LINE if /..*/;
-- }
-- close GIT2;
-- }
-- $tag=$_;
-- close GIT2;
-- close GIT; # be done
-- return $tag;
--};
--
- sub create_patches {
- my $tag=shift;
- my $pdir=shift;
-@@ -31,7 +15,8 @@ my $datestr = strftime "%Y%m%d", gmtime;
-
- my $tag=shift;
- my $pdir=shift;
--$tag=&last_tag if not defined $tag;
-+$tag=`git describe --abbrev=0 --tags` if not defined $tag;
-+chomp($tag);
- my @patches=&create_patches($tag, $pdir);
- my $num=$#patches + 2;
- $tag=~s/[^0-9]+?([0-9]+)/$1/;
diff --git a/0023-systemd-include-the-systemd-random-seed-load.service.patch b/0023-systemd-include-the-systemd-random-seed-load.service.patch
deleted file mode 100644
index de7c5ed..0000000
--- a/0023-systemd-include-the-systemd-random-seed-load.service.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5d68c80b1638636a2cbbdf0fddad0d402e0abcd7 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 13:10:24 +0200
-Subject: [PATCH] systemd: include the systemd-random-seed-load.service
-
-The systemd cryptsetup-generator wants systemd-random-seed-load.service
-in case /dev/urandom is the device.
----
- modules.d/98systemd/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
-index 450b42b..9183626 100755
---- a/modules.d/98systemd/module-setup.sh
-+++ b/modules.d/98systemd/module-setup.sh
-@@ -85,6 +85,7 @@ install() {
- $systemdsystemunitdir/systemd-ask-password-plymouth.service \
- $systemdsystemunitdir/systemd-journald.service \
- $systemdsystemunitdir/systemd-vconsole-setup.service \
-+ $systemdsystemunitdir/systemd-random-seed-load.service \
- $systemdsystemunitdir/sysinit.target.wants/systemd-modules-load.service \
- $systemdsystemunitdir/sysinit.target.wants/systemd-ask-password-console.path \
- $systemdsystemunitdir/sysinit.target.wants/systemd-journald.service \
diff --git a/0024-url-lib-module-setup.sh-install-ca-bundle.crt-by-lib.patch b/0024-url-lib-module-setup.sh-install-ca-bundle.crt-by-lib.patch
deleted file mode 100644
index 847e62a..0000000
--- a/0024-url-lib-module-setup.sh-install-ca-bundle.crt-by-lib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1540df0e794d73442188667fa40622bdb6c591b5 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 11:29:00 +0200
-Subject: [PATCH] url-lib/module-setup.sh: install ca-bundle.crt by libcurl.so
-
-https://bugzilla.redhat.com/show_bug.cgi?id=950770
-
-curl seems to look for /etc/pki/tls/certs/ca-bundle.crt
-
-extract the correct path by disecting libcurl.so
----
- modules.d/45url-lib/module-setup.sh | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh
-index 0fb3667..e8b9700 100755
---- a/modules.d/45url-lib/module-setup.sh
-+++ b/modules.d/45url-lib/module-setup.sh
-@@ -12,6 +12,7 @@ depends() {
- }
-
- install() {
-+ local _dir _crt _found
- inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
- dracut_install curl
- # also install libs for curl https
-@@ -20,11 +21,17 @@ install() {
- inst_libdir_file "libsoftokn3.so*"
- inst_libdir_file "libsqlite3.so*"
-
-- mkdir -m 0755 -p "$initdir/etc/ssl/certs"
-- if ! inst_any -t /etc/ssl/certs/ca-bundle.crt \
-- /etc/ssl/certs/ca-bundle.crt \
-- /etc/ssl/certs/ca-certificates.crt; then
-- dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work."
-- fi
-+ for _dir in $libdirs; do
-+ [[ -d $_dir ]] || continue
-+ _crt=$(grep -F --binary-files=text -z .crt $_dir/libcurl.so)
-+ [[ $_crt ]] || continue
-+ [[ $_crt == /*/* ]] || continue
-+ if ! inst_simple "$_crt"; then
-+ dwarn "Couldn't install '$_crt' SSL CA cert bundle; HTTPS might not work."
-+ continue
-+ fi
-+ _found=1
-+ done
-+ [[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work."
- }
-
diff --git a/0025-dmsquash-live-add-support-for-iso-scan-filename-kern.patch b/0025-dmsquash-live-add-support-for-iso-scan-filename-kern.patch
deleted file mode 100644
index eace1f4..0000000
--- a/0025-dmsquash-live-add-support-for-iso-scan-filename-kern.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 14499534ba9694591bbcf8741ba7e3a66d71e2d3 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 15 Apr 2013 11:39:32 +0200
-Subject: [PATCH] dmsquash-live: add support for "iso-scan/filename" kernel
- parameter
-
-now you can write grub entries like
-
- set isofile="/Fedora-live.iso"
- loopback loop $isofile
- linux loop)/isolinux/vmlinuz iso-scan/filename=$isofile root=live:CDLABEL=Fedora-...
- initrd (loop)/isolinux/initrd0.img
----
- modules.d/90dmsquash-live/iso-scan.sh | 25 +++++++++++++++++++++++++
- modules.d/90dmsquash-live/module-setup.sh | 2 ++
- modules.d/90dmsquash-live/parse-iso-scan.sh | 14 ++++++++++++++
- 3 files changed, 41 insertions(+)
- create mode 100755 modules.d/90dmsquash-live/iso-scan.sh
- create mode 100755 modules.d/90dmsquash-live/parse-iso-scan.sh
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-new file mode 100755
-index 0000000..9300d12
---- /dev/null
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -0,0 +1,25 @@
-+#!/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
-+
-+PATH=/usr/sbin:/usr/bin:/sbin:/bin
-+
-+isofile=$1
-+
-+[ -z "$isofile" ] && exit 1
-+
-+mkdir -p "/run/initramfs/isoscan"
-+for dev in /dev/disk/by-uuid/*; do
-+ mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-+ if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-+ losetup -f "/run/initramfs/isoscan/$isofile"
-+ exit 0
-+ else
-+ umount "/run/initramfs/isoscan"
-+ fi
-+done
-+
-+rmdir "/run/initramfs/isoscan"
-+exit 1
-diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh
-index 76358da..5b283d1 100755
---- a/modules.d/90dmsquash-live/module-setup.sh
-+++ b/modules.d/90dmsquash-live/module-setup.sh
-@@ -23,10 +23,12 @@ install() {
- dracut_install umount dmsetup blkid dd losetup grep blockdev
- dracut_install -o checkisomd5
- inst_hook cmdline 30 "$moddir/parse-dmsquash-live.sh"
-+ inst_hook cmdline 31 "$moddir/parse-iso-scan.sh"
- inst_hook pre-udev 30 "$moddir/dmsquash-live-genrules.sh"
- inst_hook pre-udev 30 "$moddir/dmsquash-liveiso-genrules.sh"
- inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
- inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
-+ inst_script "$moddir/iso-scan.sh" "/sbin/iso-scan"
- # should probably just be generally included
- inst_rules 60-cdrom_id.rules
- inst_simple "$moddir/checkisomd5@.service" "/etc/systemd/system/checkisomd5@.service"
-diff --git a/modules.d/90dmsquash-live/parse-iso-scan.sh b/modules.d/90dmsquash-live/parse-iso-scan.sh
-new file mode 100755
-index 0000000..be071fd
---- /dev/null
-+++ b/modules.d/90dmsquash-live/parse-iso-scan.sh
-@@ -0,0 +1,14 @@
-+#!/bin/sh
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+# live images are specified with
-+# root=live:backingdev
-+
-+isofile=$(getarg iso-scan/filename)
-+
-+if [ -n "$isofile" ]; then
-+ {
-+ printf 'KERNEL=="loop0", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/iso-scan %s"\n' \
-+ "'${isofile}'"
-+ } >> /etc/udev/rules.d/99-isofile-mount.rules
-+fi
diff --git a/0026-Makefile-fixup-tarball-Makefile.patch b/0026-Makefile-fixup-tarball-Makefile.patch
deleted file mode 100644
index f4c4a26..0000000
--- a/0026-Makefile-fixup-tarball-Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 26ab7b07a6c7bff7b62a59ab880e735017076141 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 15 Apr 2013 11:53:03 +0200
-Subject: [PATCH] Makefile: fixup tarball Makefile
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6bda766..d3798c6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -158,7 +158,7 @@ dracut-$(VERSION).tar.bz2: doc
- git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar
- mkdir -p dracut-$(VERSION)
- cp $(manpages) dracut.html dracut-$(VERSION)
-- sed 's/^RELEASEDVERSION =.*/RELEASEDVERSION = $(VERSION)/' Makefile > dracut-$(VERSION)/Makefile
-+ git show $(VERSION):Makefile | sed 's/^RELEASEDVERSION =.*/RELEASEDVERSION = $(VERSION)/' > dracut-$(VERSION)/Makefile
- tar --owner=root --group=root -rf dracut-$(VERSION).tar dracut-$(VERSION)/*.[0-9] dracut-$(VERSION)/dracut.html dracut-$(VERSION)/Makefile
- rm -fr dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
- bzip2 -9 dracut-$(VERSION).tar
diff --git a/0027-lsinitrd-switch-to-getopt-and-add-f-and-k-parameter.patch b/0027-lsinitrd-switch-to-getopt-and-add-f-and-k-parameter.patch
deleted file mode 100644
index 11d58df..0000000
--- a/0027-lsinitrd-switch-to-getopt-and-add-f-and-k-parameter.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 7d9bb76ac7cf6996318a0cfbc8576d8d307bff3e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 10:44:56 +0200
-Subject: [PATCH] lsinitrd: switch to getopt and add "-f" and "-k" parameter
-
----
- lsinitrd.1.asc | 10 +++++++++-
- lsinitrd.sh | 61 +++++++++++++++++++++++++++++++++++++++++++---------------
- 2 files changed, 54 insertions(+), 17 deletions(-)
-
-diff --git a/lsinitrd.1.asc b/lsinitrd.1.asc
-index fd98161..4293910 100644
---- a/lsinitrd.1.asc
-+++ b/lsinitrd.1.asc
-@@ -10,7 +10,9 @@ lsinitrd - tool to show the contents of an initramfs image
-
- SYNOPSIS
- --------
--*lsinitrd* ['OPTION...'] [<image>]
-+*lsinitrd* ['OPTION...'] [<image> [<filename> [<filename> [...] ]]]
-+
-+*lsinitrd* ['OPTION...'] -k <kernel-version>
-
- DESCRIPTION
- -----------
-@@ -26,6 +28,12 @@ OPTIONS
- **-s, --size**::
- sort the contents of the initramfs by size.
-
-+**-f, --file** _<filename>_::
-+ print the contents of <filename>.
-+
-+**-k, --kver** _<kernel version>_::
-+ inspect the initramfs of <kernel version>.
-+
- AVAILABILITY
- ------------
- The lsinitrd command is part of the dracut package and is available from
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 1b27393..42e30d9 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -22,29 +22,51 @@
- usage()
- {
- {
-- echo "Usage: ${0##*/} [-s] [<initramfs file> [<filename>]]"
-+ echo "Usage: ${0##*/} [options] [<initramfs file> [<filename> [<filename> [...] ]]]"
-+ echo "Usage: ${0##*/} [options] -k <kernel version>"
- echo
-- echo "-h, --help print a help message and exit."
-- echo "-s, --size sort the contents of the initramfs by size."
-+ echo "-h, --help print a help message and exit."
-+ echo "-s, --size sort the contents of the initramfs by size."
-+ echo "-f, --file <filename> print the contents of <filename>."
-+ echo "-k, --kver <kernel version> inspect the initramfs of <kernel version>."
- echo
- } >&2
- }
-
--[[ $# -le 2 ]] || { usage ; exit 1 ; }
--
- sorted=0
--while getopts "s" opt; do
-- case $opt in
-- s) sorted=1;;
-- h) usage; exit 0;;
-- \?) usage; exit 1;;
-+declare -A filenames
-+
-+unset POSIXLY_CORRECT
-+TEMP=$(getopt \
-+ -o "shf:k:" \
-+ --long kver: \
-+ --long file: \
-+ --long help \
-+ --long size \
-+ -- "$@")
-+
-+if (( $? != 0 )); then
-+ usage
-+ exit 1
-+fi
-+
-+eval set -- "$TEMP"
-+
-+while (($# > 0)); do
-+ case $1 in
-+ -k|--kver) KERNEL_VERSION="$2"; shift;;
-+ -f|--file) filenames[${2#/}]=1; shift;;
-+ -s|--size) sorted=1;;
-+ -h|--help) usage; exit 0;;
-+ --) shift;break;;
-+ *) usage; exit 1;;
- esac
-+ shift
- done
--shift $((OPTIND-1))
-
--KERNEL_VERSION="$(uname -r)"
-+[[ $KERNEL_VERSION ]] || KERNEL_VERSION="$(uname -r)"
-
--if [[ "$1" ]]; then
-+if [[ $1 ]]; then
- image="$1"
- if ! [[ -f "$image" ]]; then
- {
-@@ -57,13 +79,20 @@ if [[ "$1" ]]; then
- else
- [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
-
-- if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
-+ if [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
-+ && [[ $MACHINE_ID ]] \
-+ && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
- image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
- else
- image="/boot/initramfs-${KERNEL_VERSION}.img"
- fi
- fi
-
-+shift
-+while (($# > 0)); do
-+ filenames[${1#/}]=1;
-+ shift
-+done
-
- if ! [[ -f "$image" ]]; then
- {
-@@ -93,8 +122,8 @@ elif [[ "$FILE_T" =~ :\ data ]]; then
- CAT="xzcat $XZ_SINGLE_STREAM"
- fi
-
--if [[ $# -eq 2 ]]; then
-- $CAT $image | cpio --extract --verbose --quiet --to-stdout ${2#/} 2>/dev/null
-+if (( ${#filenames[@]} > 0 )); then
-+ $CAT $image | cpio --extract --verbose --quiet --to-stdout ${!filenames[@]} 2>/dev/null
- exit $?
- fi
-
diff --git a/0028-lsinitrd-add-bash-completion.patch b/0028-lsinitrd-add-bash-completion.patch
deleted file mode 100644
index cd2d18b..0000000
--- a/0028-lsinitrd-add-bash-completion.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 7dbca9be866afd65d7ab5368250429e4291aaf88 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 10:43:39 +0200
-Subject: [PATCH] lsinitrd: add bash completion
-
----
- Makefile | 1 +
- dracut.spec | 1 +
- lsinitrd-bash-completion.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 65 insertions(+)
- create mode 100644 lsinitrd-bash-completion.sh
-
-diff --git a/Makefile b/Makefile
-index d3798c6..e0baef2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -137,6 +137,7 @@ endif
- install -m 0755 51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
- mkdir -p $(DESTDIR)${bashcompletiondir}
- install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
-+ install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
-
- dracut-version.sh:
- @echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh
-diff --git a/dracut.spec b/dracut.spec
-index cb605c6..197e9a0 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -282,6 +282,7 @@ rm -rf $RPM_BUILD_ROOT
- # compat symlink
- /sbin/dracut
- %{_datadir}/bash-completion/completions/dracut
-+%{_datadir}/bash-completion/completions/lsinitrd
- %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
- %{_bindir}/mkinitrd
- %{_bindir}/lsinitrd
-diff --git a/lsinitrd-bash-completion.sh b/lsinitrd-bash-completion.sh
-new file mode 100644
-index 0000000..78ab165
---- /dev/null
-+++ b/lsinitrd-bash-completion.sh
-@@ -0,0 +1,63 @@
-+#!/bin/bash
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+#
-+# Copyright 2013 Red Hat, Inc. All rights reserved.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+__contains_word () {
-+ local word=$1; shift
-+ for w in $*; do [[ $w = $word ]] && return 0; done
-+ return 1
-+}
-+
-+_lsinitrd() {
-+ local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-+ local -A OPTS=(
-+ [STANDALONE]='-s --size -h --help'
-+
-+ [ARG]='-f --file -k --kver'
-+ )
-+
-+ if __contains_word "$prev" ${OPTS[ARG]}; then
-+ case $prev in
-+ --file|-f)
-+ comps=$(compgen -f -- "$cur")
-+ compopt -o filenames
-+ ;;
-+ --kver|-k)
-+ comps=$(cd /lib/modules; echo [0-9]*)
-+ ;;
-+ *)
-+ return 0
-+ ;;
-+ esac
-+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-+ return 0
-+ fi
-+
-+ if [[ $cur = -* ]]; then
-+ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-+ return 0
-+ fi
-+
-+ comps=$(compgen -f -- "$cur")
-+ compopt -o filenames
-+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-+ return 0
-+}
-+
-+complete -F _lsinitrd lsinitrd
diff --git a/0029-dracut-bash-completion.sh-file-filename-completion.patch b/0029-dracut-bash-completion.sh-file-filename-completion.patch
deleted file mode 100644
index 3219263..0000000
--- a/0029-dracut-bash-completion.sh-file-filename-completion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 46a885bf9f90f7cfacb6977ff602c04efdb75f8e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 11:18:18 +0200
-Subject: [PATCH] dracut-bash-completion.sh: file filename completion
-
----
- dracut-bash-completion.sh | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh
-index 322e630..ae33b3e 100644
---- a/dracut-bash-completion.sh
-+++ b/dracut-bash-completion.sh
-@@ -44,15 +44,19 @@ _dracut() {
-
- if __contains_word "$prev" ${OPTS[ARG]}; then
- case $prev in
-- --kmoddir|-k|--fwdir|-c|--conf|--confdir|--tmpdir|--sshkey|--add-fstab|--add-device|-I|--install)
-+ --kmoddir|-k|--fwdir|--confdir|--tmpdir)
- comps=$(compgen -d -- "$cur")
- compopt -o filenames
- ;;
-+ -c|--conf|--sshkey|--add-fstab|--add-device|-I|--install)
-+ comps=$(compgen -f -- "$cur")
-+ compopt -o filenames
-+ ;;
- -a|-m|-o|--add|--modules|--omit)
- comps=$(dracut --list-modules 2>/dev/null)
- ;;
- --kver)
-- comps=$(cd /lib/modules; echo *)
-+ comps=$(cd /lib/modules; echo [0-9]*)
- ;;
- *)
- return 0
diff --git a/0030-lsinitrd-drop-use-of-file.patch b/0030-lsinitrd-drop-use-of-file.patch
deleted file mode 100644
index 1deae35..0000000
--- a/0030-lsinitrd-drop-use-of-file.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 884e1cda7cf999ef15dd78a54a9ce0bf99afd8de Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 12:44:25 +0200
-Subject: [PATCH] lsinitrd: drop use of "file"
-
----
- dracut.spec | 4 +---
- lsinitrd.sh | 38 ++++++++++++++++++++------------------
- 2 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/dracut.spec b/dracut.spec
-index 197e9a0..3d42af2 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -84,11 +84,9 @@ Requires: findutils
- Requires: grep
- Requires: hardlink
- Requires: gzip xz
--Requires: module-init-tools >= 3.7-9
-+Requires: kmod
- Requires: sed
--Requires: file
- Requires: kpartx
--Requires: kbd kbd-misc
-
- %if 0%{?fedora} || 0%{?rhel} > 6
- Requires: util-linux >= 2.21
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 42e30d9..0481975 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -103,37 +103,39 @@ if ! [[ -f "$image" ]]; then
- exit 1
- fi
-
--CAT=zcat
--FILE_T=$(file --dereference "$image")
--
--if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then
-- XZ_SINGLE_STREAM="--single-stream"
--fi
--
--if [[ "$FILE_T" =~ :\ gzip\ compressed\ data ]]; then
-- CAT=zcat
--elif [[ "$FILE_T" =~ :\ xz\ compressed\ data ]]; then
-- CAT="xzcat $XZ_SINGLE_STREAM"
--elif [[ "$FILE_T" =~ :\ XZ\ compressed\ data ]]; then
-- CAT="xzcat $XZ_SINGLE_STREAM"
--elif [[ "$FILE_T" =~ :\ LZMA ]]; then
-- CAT="xzcat $XZ_SINGLE_STREAM"
--elif [[ "$FILE_T" =~ :\ data ]]; then
-- CAT="xzcat $XZ_SINGLE_STREAM"
--fi
-+read -N 6 bin < "$image"
-+case $bin in
-+ $'\x1f\x8b'*)
-+ CAT="zcat";;
-+ BZh*)
-+ CAT="bzcat";;
-+ 070701)
-+ CAT="cat";;
-+ *)
-+ CAT="xzcat";
-+ if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
-+ CAT="xzcat --single-stream"
-+ fi
-+ ;;
-+esac
-
- if (( ${#filenames[@]} > 0 )); then
- $CAT $image | cpio --extract --verbose --quiet --to-stdout ${!filenames[@]} 2>/dev/null
- exit $?
- fi
-
-+ret=0
-+
- echo "$image: $(du -h $image | while read a b; do echo $a;done)"
- echo "========================================================================"
- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout '*lib/dracut/dracut-*' 2>/dev/null
-+((ret+=$?))
- echo "========================================================================"
- if [ "$sorted" -eq 1 ]; then
- $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
- else
- $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
- fi
-+((ret+=$?))
- echo "========================================================================"
-+exit $ret
diff --git a/0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch b/0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch
deleted file mode 100644
index c30083b..0000000
--- a/0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4460416abcb420588d189dd5bac6860c79b67ab5 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 13:33:40 +0200
-Subject: [PATCH] lsinitrd.sh: do not output filename for a single file
-
----
- lsinitrd.sh | 41 ++++++++++++++++++++++++++---------------
- 1 file changed, 26 insertions(+), 15 deletions(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 0481975..cd58529 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -119,23 +119,34 @@ case $bin in
- ;;
- esac
-
--if (( ${#filenames[@]} > 0 )); then
-- $CAT $image | cpio --extract --verbose --quiet --to-stdout ${!filenames[@]} 2>/dev/null
-- exit $?
--fi
--
- ret=0
-
--echo "$image: $(du -h $image | while read a b; do echo $a;done)"
--echo "========================================================================"
--$CAT "$image" | cpio --extract --verbose --quiet --to-stdout '*lib/dracut/dracut-*' 2>/dev/null
--((ret+=$?))
--echo "========================================================================"
--if [ "$sorted" -eq 1 ]; then
-- $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
-+if (( ${#filenames[@]} > 0 )); then
-+ (( ${#filenames[@]} == 1 )) && nofileinfo=1
-+ for f in ${!filenames[@]}; do
-+ [[ $nofileinfo ]] || echo "initramfs:/$f"
-+ [[ $nofileinfo ]] || echo "========================================================================"
-+ $CAT $image | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
-+ ((ret+=$?))
-+ [[ $nofileinfo ]] || echo "========================================================================"
-+ [[ $nofileinfo ]] || echo
-+ done
- else
-- $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
-+ echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)"
-+ echo "========================================================================"
-+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout '*lib/dracut/dracut-*' 2>/dev/null)
-+ ((ret+=$?))
-+ echo "$version with dracut modules:"
-+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout 'usr/lib/dracut/modules.txt' 2>/dev/null
-+ ((ret+=$?))
-+ echo "========================================================================"
-+ if [ "$sorted" -eq 1 ]; then
-+ $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
-+ else
-+ $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
-+ fi
-+ ((ret+=$?))
-+ echo "========================================================================"
- fi
--((ret+=$?))
--echo "========================================================================"
-+
- exit $ret
diff --git a/0032-.gitignore-ignore-more-files.patch b/0032-.gitignore-ignore-more-files.patch
deleted file mode 100644
index f6555dd..0000000
--- a/0032-.gitignore-ignore-more-files.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d0eedc4a5fa0bb23a5cf0aa6cea2f45095c74e1d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 13:38:16 +0200
-Subject: [PATCH] .gitignore: ignore more files
-
----
- .gitignore | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/.gitignore b/.gitignore
-index bec31ab..25506f1 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -13,3 +13,7 @@ test*.img
- /.project
- /dracut-version.sh
- /install/dracut-install
-+/*.rpm
-+/*.[0-9]
-+/modules.d/98systemd/*.service.8
-+/*.sign
diff --git a/0033-Makefile-remove-dracut-version.sh-on-clean.patch b/0033-Makefile-remove-dracut-version.sh-on-clean.patch
deleted file mode 100644
index 9463ab0..0000000
--- a/0033-Makefile-remove-dracut-version.sh-on-clean.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9268366cad0ab1b6340d50404af56760ebe660aa Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 16 Apr 2013 13:41:19 +0200
-Subject: [PATCH] Makefile: remove dracut-version.sh on clean
-
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index e0baef2..2b130d9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -149,6 +149,7 @@ clean:
- $(RM) $(manpages:%=%.xml) dracut.xml
- $(RM) test-*.img
- $(RM) dracut-*.rpm dracut-*.tar.bz2
-+ $(RM) dracut-version.sh
- $(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS)
- $(RM) $(manpages) dracut.html
- $(MAKE) -C test clean
diff --git a/0034-base-dracut-lib.sh-do-not-setdebug-if-not-in-initram.patch b/0034-base-dracut-lib.sh-do-not-setdebug-if-not-in-initram.patch
deleted file mode 100644
index 8d3d3fd..0000000
--- a/0034-base-dracut-lib.sh-do-not-setdebug-if-not-in-initram.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 2b125c69cc80baae765a868992003ddd349a7ae9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 18 Apr 2013 12:54:30 +0200
-Subject: [PATCH] base/dracut-lib.sh: do not setdebug, if not in initramfs
-
----
- modules.d/99base/dracut-lib.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 9f4b2d2..ae79a82 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -325,6 +325,7 @@ splitsep() {
- }
-
- setdebug() {
-+ [ -f /etc/initrd-release ] || return
- if [ -z "$RD_DEBUG" ]; then
- if [ -e /proc/cmdline ]; then
- RD_DEBUG=no
diff --git a/0035-dracut-install-error-out-if-ldd-reports-no-execution.patch b/0035-dracut-install-error-out-if-ldd-reports-no-execution.patch
deleted file mode 100644
index ade0303..0000000
--- a/0035-dracut-install-error-out-if-ldd-reports-no-execution.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b4dc22cab7b8b071c8a150b9c61edaa247bacb6a Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 18 Apr 2013 12:54:55 +0200
-Subject: [PATCH] dracut-install: error out, if ldd reports no execution
- permission
-
-This turns off lazy resolving on noexec mounted tmp directories.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=953426
----
- install/dracut-install.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 5040dea..2d0412c 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -285,6 +285,12 @@ static int resolve_deps(const char *src)
-
- log_debug("ldd: '%s'", buf);
-
-+ if (strstr(buf, "you do not have execution permission")) {
-+ log_error(buf);
-+ ret+=1;
-+ break;
-+ }
-+
- if (strstr(buf, "not a dynamic executable"))
- break;
-
diff --git a/0036-shutdown-redirect-output-to-dev-console-only-if-it-e.patch b/0036-shutdown-redirect-output-to-dev-console-only-if-it-e.patch
deleted file mode 100644
index c017606..0000000
--- a/0036-shutdown-redirect-output-to-dev-console-only-if-it-e.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3be5d63c2fe24252fff92ea9c0ad43d4c7e579bd Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 19 Apr 2013 15:00:20 +0200
-Subject: [PATCH] shutdown: redirect output to /dev/console only if it exists
-
----
- modules.d/99shutdown/shutdown.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
-index 6457cb0..f7b8509 100755
---- a/modules.d/99shutdown/shutdown.sh
-+++ b/modules.d/99shutdown/shutdown.sh
-@@ -8,7 +8,7 @@
- # Harald Hoyer <harald@redhat.com>
- ACTION="$1"
-
--exec </dev/console >>/dev/console 2>>/dev/console
-+[ test -w /dev/console ] && exec </dev/console >>/dev/console 2>>/dev/console
-
- export TERM=linux
- export PATH=/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/0037-fixup-3be5d63c2f.patch b/0037-fixup-3be5d63c2f.patch
deleted file mode 100644
index 983dc28..0000000
--- a/0037-fixup-3be5d63c2f.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ab42fe38fd1672f83cd3500771caf321ae25080d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 19 Apr 2013 15:08:16 +0200
-Subject: [PATCH] fixup 3be5d63c2f
-
-either test or []
----
- modules.d/99shutdown/shutdown.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
-index f7b8509..d6a532b 100755
---- a/modules.d/99shutdown/shutdown.sh
-+++ b/modules.d/99shutdown/shutdown.sh
-@@ -8,7 +8,7 @@
- # Harald Hoyer <harald@redhat.com>
- ACTION="$1"
-
--[ test -w /dev/console ] && exec </dev/console >>/dev/console 2>>/dev/console
-+[ -w /dev/console ] && exec </dev/console >>/dev/console 2>>/dev/console
-
- export TERM=linux
- export PATH=/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/0038-fixed-fips-mode.patch b/0038-fixed-fips-mode.patch
deleted file mode 100644
index e35b4f3..0000000
--- a/0038-fixed-fips-mode.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 6f4c2dada400f455cf7ee0afcd6bf41974c712d4 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 25 Apr 2013 19:44:01 +0200
-Subject: [PATCH] fixed fips mode
-
-- preserve timestamps
-- copy /lib*/hmaccalc files
-- run sha512hmac after kernel module loading
-- add more fips kernel modules
----
- dracut.sh | 2 ++
- install/dracut-install.c | 10 +++++++++-
- modules.d/01fips/fips.sh | 7 ++++---
- modules.d/01fips/module-setup.sh | 8 +++++---
- modules.d/99base/dracut-lib.sh | 2 +-
- 5 files changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 586172c..82b4a5f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1179,6 +1179,8 @@ if [[ $do_strip = yes ]] ; then
- -executable -not -path '*/lib/modules/*.ko' -print0 \
- | while read -r -d $'\0' f; do
- if ! [[ -e "${f%/*}/.${f##*/}.hmac" ]] \
-+ && ! [[ -e "/lib/hmaccalc/${f##*/}.hmac" ]] \
-+ && ! [[ -e "/lib64/hmaccalc/${f##*/}.hmac" ]] \
- && ! [[ -e "/lib/fipscheck/${f##*/}.hmac" ]] \
- && ! [[ -e "/lib64/fipscheck/${f##*/}.hmac" ]]; then
- echo -n "$f"; echo -n -e "\000"
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 2d0412c..2fad6df 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -214,8 +214,14 @@ static int cp(const char *src, const char *dst)
- ret = clone_file(dest_desc, source_desc);
- close(source_desc);
- if (ret == 0) {
-+ struct timeval tv[2];
- if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0)
- fchown(dest_desc, -1, sb.st_gid);
-+ tv[0].tv_sec = sb.st_atime;
-+ tv[0].tv_usec = 0;
-+ tv[1].tv_sec = sb.st_mtime;
-+ tv[1].tv_usec = 0;
-+ futimes(dest_desc, tv);
- close(dest_desc);
- return ret;
- }
-@@ -230,7 +236,7 @@ static int cp(const char *src, const char *dst)
- normal_copy:
- pid = fork();
- if (pid == 0) {
-- execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode", "-fL", src, dst, NULL);
-+ execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, NULL);
- _exit(EXIT_FAILURE);
- }
-
-@@ -350,6 +356,8 @@ static int hmac_install(const char *src, const char *dst, const char *hmacpath)
- if (!hmacpath) {
- hmac_install(src, dst, "/lib/fipscheck");
- hmac_install(src, dst, "/lib64/fipscheck");
-+ hmac_install(src, dst, "/lib/hmaccalc");
-+ hmac_install(src, dst, "/lib64/hmaccalc");
- }
-
- srcpath[dlen] = '\0';
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index 48ad0e6..ce3e49c 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -51,7 +51,6 @@ mount_boot()
-
- do_fips()
- {
-- info "Checking integrity of kernel"
- KERNEL=$(uname -r)
-
- if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
-@@ -59,8 +58,6 @@ do_fips()
- return 1
- fi
-
-- sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
--
- FIPSMODULES=$(cat /etc/fipsmodules)
-
- info "Loading and integrity checking all crypto modules"
-@@ -72,6 +69,10 @@ do_fips()
- info "Self testing crypto algorithms"
- modprobe tcrypt || return 1
- rmmod tcrypt
-+
-+ info "Checking integrity of kernel"
-+ sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
-+
- info "All initrd crypto checks done"
-
- > /tmp/fipsdone
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index 8953132..a7f5be8 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -12,9 +12,11 @@ depends() {
-
- installkernel() {
- local _fipsmodules _mod
-- _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr gcm ghash_generic"
-- _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha256_generic sha512 sha512_generic"
-- _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt lzo"
-+ _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
-+ _fipsmodules+="chainiv crc32c cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod "
-+ _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
-+ _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
-+ _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
-
- mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index ae79a82..9bd25f4 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -384,7 +384,7 @@ die() {
- echo "warn dracut: FATAL: \"$*\"";
- echo "warn dracut: Refusing to continue";
- } >> $hookdir/emergency/01-die.sh
--
-+ [ -d /run/initramfs ] || mkdir -p /run/initramfs
- > /run/initramfs/.die
- emergency_shell
- exit 1
diff --git a/0039-dracut.sh-do-not-preunlink-for-fips-mode.patch b/0039-dracut.sh-do-not-preunlink-for-fips-mode.patch
deleted file mode 100644
index c96b92e..0000000
--- a/0039-dracut.sh-do-not-preunlink-for-fips-mode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8461734ee47fb1078e543f55f9ca6f8530855361 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 25 Apr 2013 21:16:03 +0200
-Subject: [PATCH] dracut.sh: do not preunlink for fips mode
-
-just install prelink and the cache files
----
- dracut.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 82b4a5f..5f0a1b3 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1140,12 +1140,8 @@ fi
- PRELINK_BIN=$(command -v prelink)
- if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
- if [[ $DRACUT_FIPS_MODE ]]; then
-- dinfo "*** Pre-unlinking files ***"
-+ dinfo "*** Installing prelink files ***"
- dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-- chroot "$initdir" $PRELINK_BIN -u -a
-- rm -f "$initdir"/$PRELINK_BIN
-- rm -fr "$initdir"/etc/prelink.*
-- dinfo "*** Pre-unlinking files done ***"
- else
- dinfo "*** Pre-linking files ***"
- dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
diff --git a/0040-fips-do-not-fail-immediatly-after-loading-the-crypto.patch b/0040-fips-do-not-fail-immediatly-after-loading-the-crypto.patch
deleted file mode 100644
index 08c8a59..0000000
--- a/0040-fips-do-not-fail-immediatly-after-loading-the-crypto.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 26a077fc7e5a381284a9b474acdf22a58fb47dda Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 29 Apr 2013 11:34:26 +0200
-Subject: [PATCH] fips: do not fail immediatly after loading the crypto modules
-
-Fail only if tcrypt insmod failed.
----
- modules.d/01fips/fips.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index ce3e49c..0095416 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -63,7 +63,7 @@ do_fips()
- info "Loading and integrity checking all crypto modules"
- for module in $FIPSMODULES; do
- if [ "$module" != "tcrypt" ]; then
-- modprobe ${module} || return 1
-+ modprobe ${module}
- fi
- done
- info "Self testing crypto algorithms"
diff --git a/0041-dracut-install-make-use-of-_cleanup_-macros.patch b/0041-dracut-install-make-use-of-_cleanup_-macros.patch
deleted file mode 100644
index ca1319e..0000000
--- a/0041-dracut-install-make-use-of-_cleanup_-macros.patch
+++ /dev/null
@@ -1,785 +0,0 @@
-From 3ed08d1e4dbb52dc181be01b6e147017327aa6d9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 29 Apr 2013 11:35:23 +0200
-Subject: [PATCH] dracut-install: make use of _cleanup_* macros
-
----
- install/dracut-install.c | 230 +++++++++++++++++++++++++----------------------
- install/macro.h | 150 +++++++++++++++++++++++++------
- install/util.h | 36 ++++++++
- 3 files changed, 281 insertions(+), 135 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 2fad6df..b4bf681 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -62,6 +62,10 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- static size_t dir_len(char const *file)
- {
- size_t length;
-+
-+ if(!file)
-+ return 0;
-+
- /* Strip the basename and any redundant slashes before it. */
- for (length = strlen(file)-1; 0 < length; length--)
- if (file[length] == '/' && file[length-1] != '/')
-@@ -73,20 +77,22 @@ static char *convert_abs_rel(const char *from, const char *target)
- {
- /* we use the 4*MAXPATHLEN, which should not overrun */
- char relative_from[MAXPATHLEN * 4];
-- char *realtarget = NULL;
-- char *p, *q;
-+ _cleanup_free_ char *realtarget = NULL;
-+ _cleanup_free_ char *target_dir_p = NULL, *realpath_p = NULL;
- const char *realfrom = from;
- int level = 0, fromlevel = 0, targetlevel = 0;
- int l, i, rl;
- int dirlen;
-
-- p = strdup(target);
-- dirlen = dir_len(p);
-- p[dirlen] = '\0';
-- q = realpath(p, NULL);
-+ target_dir_p = strdup(target);
-+ if (!target_dir_p)
-+ return strdup(from);
-+
-+ dirlen = dir_len(target_dir_p);
-+ target_dir_p[dirlen] = '\0';
-+ realpath_p = realpath(target_dir_p, NULL);
-
-- if (q == NULL) {
-- free(p);
-+ if (realpath_p == NULL) {
- log_warning("convert_abs_rel(): target '%s' directory has no realpath.", target);
- return strdup(from);
- }
-@@ -95,11 +101,9 @@ static char *convert_abs_rel(const char *from, const char *target)
- * character - need to skip all leading /'s */
- rl = strlen(target);
- for (i = dirlen+1; i < rl; ++i)
-- if (p[i] != '/')
-+ if (target_dir_p[i] != '/')
- break;
-- asprintf(&realtarget, "%s/%s", q, &p[i]);
-- free(p);
-- free(q);
-+ asprintf(&realtarget, "%s/%s", realpath_p, &target_dir_p[i]);
-
- /* now calculate the relative path from <from> to <target> and
- store it in <relative_from>
-@@ -122,8 +126,6 @@ static char *convert_abs_rel(const char *from, const char *target)
- if (realtarget[i] == '/')
- level++;
-
-- free(realtarget);
--
- /* add "../" to the relative_from path, until the common pathname is
- reached */
- for (i = level; i < targetlevel; i++) {
-@@ -155,18 +157,16 @@ static char *convert_abs_rel(const char *from, const char *target)
- static int ln_r(const char *src, const char *dst)
- {
- int ret;
-- const char *points_to = convert_abs_rel(src, dst);
-+ _cleanup_free_ const char *points_to = convert_abs_rel(src, dst);
-+
- log_info("ln -s '%s' '%s'", points_to, dst);
- ret = symlink(points_to, dst);
-
- if (ret != 0) {
- log_error("ERROR: ln -s '%s' '%s': %m", points_to, dst);
-- free((char *)points_to);
- return 1;
- }
-
-- free((char *)points_to);
--
- return 0;
- }
-
-@@ -186,11 +186,11 @@ static bool use_clone = true;
- static int cp(const char *src, const char *dst)
- {
- int pid;
-- int ret;
-+ int ret = 0;
-
- if (use_clone) {
- struct stat sb;
-- int dest_desc, source_desc;
-+ _cleanup_close_ int dest_desc = -1, source_desc = -1;
-
- if (lstat(src, &sb) != 0)
- goto normal_copy;
-@@ -207,12 +207,11 @@ static int cp(const char *src, const char *dst)
- (sb.st_mode) & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO));
-
- if (dest_desc < 0) {
-- close(source_desc);
- goto normal_copy;
- }
-
- ret = clone_file(dest_desc, source_desc);
-- close(source_desc);
-+
- if (ret == 0) {
- struct timeval tv[2];
- if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0)
-@@ -222,11 +221,10 @@ static int cp(const char *src, const char *dst)
- tv[1].tv_sec = sb.st_mtime;
- tv[1].tv_usec = 0;
- futimes(dest_desc, tv);
-- close(dest_desc);
- return ret;
- }
- close(dest_desc);
--
-+ dest_desc = -1;
- /* clone did not work, remove the file */
- unlink(dst);
- /* do not try clone again */
-@@ -243,10 +241,11 @@ static int cp(const char *src, const char *dst)
- while (waitpid(pid, &ret, 0) < 0) {
- if (errno != EINTR) {
- ret = -1;
-+ log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, dst);
- break;
- }
- }
--
-+ log_debug("cp ret = %d", ret);
- return ret;
- }
-
-@@ -256,15 +255,17 @@ static int resolve_deps(const char *src)
-
- char *buf = malloc(LINE_MAX);
- size_t linesize = LINE_MAX;
-- FILE *fptr;
-- char *cmd;
-+ _cleanup_pclose_ FILE *fptr = NULL;
-+ _cleanup_free_ char *cmd = NULL;
-
- if (strstr(src, ".so") == 0) {
-- int fd;
-+ _cleanup_close_ int fd = -1;
- fd = open(src, O_RDONLY | O_CLOEXEC);
-+ if (fd < 0)
-+ return -errno;
-+
- read(fd, buf, LINE_MAX);
- buf[LINE_MAX - 1] = '\0';
-- close(fd);
- if (buf[0] == '#' && buf[1] == '!') {
- /* we have a shebang */
- char *p, *q;
-@@ -280,7 +281,11 @@ static int resolve_deps(const char *src)
- }
-
- /* run ldd */
-- asprintf(&cmd, "ldd %s 2>&1", src);
-+ ret = asprintf(&cmd, "ldd %s 2>&1", src);
-+ if (ret < 0)
-+ return ret;
-+ ret = 0;
-+
- fptr = popen(cmd, "r");
-
- while (!feof(fptr)) {
-@@ -336,7 +341,6 @@ static int resolve_deps(const char *src)
- }
- }
- }
-- pclose(fptr);
-
- return ret;
- }
-@@ -344,10 +348,14 @@ static int resolve_deps(const char *src)
- /* Install ".<filename>.hmac" file for FIPS self-checks */
- static int hmac_install(const char *src, const char *dst, const char *hmacpath)
- {
-- char *srcpath = strdup(src);
-- char *dstpath = strdup(dst);
-- char *srchmacname = NULL;
-- char *dsthmacname = NULL;
-+ _cleanup_free_ char *srcpath = strdup(src);
-+ _cleanup_free_ char *dstpath = strdup(dst);
-+ _cleanup_free_ char *srchmacname = NULL;
-+ _cleanup_free_ char *dsthmacname = NULL;
-+
-+ if (!(srcpath && dstpath))
-+ return -ENOMEM;
-+
- size_t dlen = dir_len(src);
-
- if (endswith(src, ".hmac"))
-@@ -371,22 +379,18 @@ static int hmac_install(const char *src, const char *dst, const char *hmacpath)
- }
- log_debug("hmac cp '%s' '%s')", srchmacname, dsthmacname);
- dracut_install(srchmacname, dsthmacname, false, false, true);
-- free(dsthmacname);
-- free(srchmacname);
-- free(srcpath);
-- free(dstpath);
- return 0;
- }
-
- static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst)
- {
- struct stat sb, db;
-- char *dname = NULL;
-- char *fulldstpath = NULL;
-- char *fulldstdir = NULL;
-+ _cleanup_free_ char *fulldstpath = NULL;
-+ _cleanup_free_ char *fulldstdir = NULL;
- int ret;
- bool src_exists = true;
-- char *i, *existing;
-+ char *i = NULL;
-+ char *existing;
-
- log_debug("dracut_install('%s', '%s')", src, dst);
-
-@@ -419,6 +423,9 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- }
-
- i = strdup(dst);
-+ if (!i)
-+ return -ENOMEM;
-+
- hashmap_put(items, i, i);
-
- asprintf(&fulldstpath, "%s%s", destrootdir, dst);
-@@ -437,7 +444,6 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- } else
- log_debug("'%s' already exists", fulldstpath);
-
-- free(fulldstpath);
- /* dst does already exist */
- return ret;
- }
-@@ -449,6 +455,8 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- ret = stat(fulldstdir, &db);
-
- if (ret < 0) {
-+ _cleanup_free_ char *dname = NULL;
-+
- if (errno != ENOENT) {
- log_error("ERROR: stat '%s': %m", fulldstdir);
- return 1;
-@@ -456,35 +464,34 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- /* create destination directory */
- log_debug("dest dir '%s' does not exist", fulldstdir);
- dname = strdup(dst);
-+ if (!dname)
-+ return 1;
-+
- dname[dir_len(dname)] = '\0';
- ret = dracut_install(dname, dname, true, false, true);
-
-- free(dname);
--
- if (ret != 0) {
- log_error("ERROR: failed to create directory '%s'", fulldstdir);
-- free(fulldstdir);
- return 1;
- }
- }
-
-- free(fulldstdir);
--
- if (isdir && !src_exists) {
- log_info("mkdir '%s'", fulldstpath);
-- return mkdir(fulldstpath, 0755);
-+ ret = mkdir(fulldstpath, 0755);
-+ return ret;
- }
-
- /* ready to install src */
-
- if (S_ISDIR(sb.st_mode)) {
- log_info("mkdir '%s'", fulldstpath);
-- return mkdir(fulldstpath, sb.st_mode | S_IWUSR);
-+ ret = mkdir(fulldstpath, sb.st_mode | S_IWUSR);
-+ return ret;
- }
-
- if (S_ISLNK(sb.st_mode)) {
-- char *abspath;
-- char *absdestpath = NULL;
-+ _cleanup_free_ char *abspath = NULL;
-
- abspath = realpath(src, NULL);
-
-@@ -502,15 +509,13 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- }
-
- if (lstat(fulldstpath, &sb) != 0) {
-+ _cleanup_free_ char *absdestpath = NULL;
-
- asprintf(&absdestpath, "%s%s", destrootdir, abspath);
-
- ln_r(absdestpath, fulldstpath);
--
-- free(absdestpath);
- }
-
-- free(abspath);
- if (arg_hmac) {
- /* copy .hmac files also */
- hmac_install(src, dst, NULL);
-@@ -528,8 +533,12 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- }
- }
-
-+ log_debug("dracut_install ret = %d", ret);
- log_info("cp '%s' '%s'", src, fulldstpath);
- ret += cp(src, fulldstpath);
-+
-+ log_debug("dracut_install ret = %d", ret);
-+
- return ret;
- }
-
-@@ -540,49 +549,49 @@ static void item_free(char *i)
- }
-
- static void usage(int status)
--{
-- /* */
-- printf("\
--Usage: %s -D DESTROOTDIR [OPTION]... -a SOURCE...\n\
-- or: %s -D DESTROOTDIR [OPTION]... SOURCE DEST\n\
--\n\
--Install SOURCE to DEST in DESTROOTDIR with all needed dependencies.\n\
--\n\
-- -D --destrootdir Install all files to DESTROOTDIR as the root\n\
-- -a --all Install all SOURCE arguments to DESTROOTDIR\n\
-- -o --optional If SOURCE does not exist, do not fail\n\
-- -d --dir SOURCE is a directory\n\
-- -l --ldd Also install shebang executables and libraries\n\
-- -R --resolvelazy Only install shebang executables and libraries for all SOURCE files\n\
-- -H --fips Also install all '.SOURCE.hmac' files\n\
-- -v --verbose Show more output\n\
-- --debug Show debug output\n\
-- --version Show package version\n\
-- -h --help Show this help\n\
--\n\
--Example:\n\
--# mkdir -p /var/tmp/test-root\n\
--# %s -D /var/tmp/test-root --ldd -a sh tr\n\
--# tree /var/tmp/test-root\n\
--/var/tmp/test-root\n\
--|-- lib64 -> usr/lib64\n\
--`-- usr\n\
-- |-- bin\n\
-- | |-- bash\n\
-- | |-- sh -> bash\n\
-- | `-- tr\n\
-- `-- lib64\n\
-- |-- ld-2.15.90.so\n\
-- |-- ld-linux-x86-64.so.2 -> ld-2.15.90.so\n\
-- |-- libc-2.15.90.so\n\
-- |-- libc.so\n\
-- |-- libc.so.6 -> libc-2.15.90.so\n\
-- |-- libdl-2.15.90.so\n\
-- |-- libdl.so -> libdl-2.15.90.so\n\
-- |-- libdl.so.2 -> libdl-2.15.90.so\n\
-- |-- libtinfo.so.5 -> libtinfo.so.5.9\n\
-- `-- libtinfo.so.5.9\n\
--", program_invocation_short_name, program_invocation_short_name, program_invocation_short_name);
-+{
-+ /* */
-+ printf("Usage: %s -D DESTROOTDIR [OPTION]... -a SOURCE...\n"
-+ "or: %s -D DESTROOTDIR [OPTION]... SOURCE DEST\n"
-+ "\n"
-+ "Install SOURCE to DEST in DESTROOTDIR with all needed dependencies.\n"
-+ "\n"
-+ " -D --destrootdir Install all files to DESTROOTDIR as the root\n"
-+ " -a --all Install all SOURCE arguments to DESTROOTDIR\n"
-+ " -o --optional If SOURCE does not exist, do not fail\n"
-+ " -d --dir SOURCE is a directory\n"
-+ " -l --ldd Also install shebang executables and libraries\n"
-+ " -R --resolvelazy Only install shebang executables and libraries\n"
-+ " for all SOURCE files\n"
-+ " -H --fips Also install all '.SOURCE.hmac' files\n"
-+ " -v --verbose Show more output\n"
-+ " --debug Show debug output\n"
-+ " --version Show package version\n"
-+ " -h --help Show this help\n"
-+ "\n"
-+ "Example:\n"
-+ "# mkdir -p /var/tmp/test-root\n"
-+ "# %s -D /var/tmp/test-root --ldd -a sh tr\n"
-+ "# tree /var/tmp/test-root\n"
-+ "/var/tmp/test-root\n"
-+ "|-- lib64 -> usr/lib64\n"
-+ "`-- usr\n"
-+ " |-- bin\n"
-+ " | |-- bash\n"
-+ " | |-- sh -> bash\n"
-+ " | `-- tr\n"
-+ " `-- lib64\n"
-+ " |-- ld-2.15.90.so\n"
-+ " |-- ld-linux-x86-64.so.2 -> ld-2.15.90.so\n"
-+ " |-- libc-2.15.90.so\n"
-+ " |-- libc.so\n"
-+ " |-- libc.so.6 -> libc-2.15.90.so\n"
-+ " |-- libdl-2.15.90.so\n"
-+ " |-- libdl.so -> libdl-2.15.90.so\n"
-+ " |-- libdl.so.2 -> libdl-2.15.90.so\n"
-+ " |-- libtinfo.so.5 -> libtinfo.so.5.9\n"
-+ " `-- libtinfo.so.5.9\n"
-+ , program_invocation_short_name, program_invocation_short_name, program_invocation_short_name);
- exit(status);
- }
-
-@@ -595,7 +604,7 @@ static int parse_argv(int argc, char *argv[])
- ARG_DEBUG
- };
-
-- static const struct option const options[] = {
-+ static struct option const options[] = {
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, ARG_VERSION},
- {"dir", no_argument, NULL, 'd'},
-@@ -691,7 +700,7 @@ static int resolve_lazy(int argc, char **argv)
-
- static char *find_binary(const char *src)
- {
-- char *path;
-+ _cleanup_free_ char *path = NULL;
- char *p, *q;
- bool end = false;
- char *newsrc = NULL;
-@@ -703,6 +712,12 @@ static char *find_binary(const char *src)
- }
- path = strdup(path);
- p = path;
-+
-+ if (path == NULL) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-+
- log_debug("PATH=%s", path);
-
- do {
-@@ -716,6 +731,11 @@ static char *find_binary(const char *src)
- *q = '\0';
-
- asprintf(&newsrc, "%s/%s", p, src);
-+ if (newsrc == NULL) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-+
- p = q + 1;
-
- if (stat(newsrc, &sb) != 0) {
-@@ -729,9 +749,9 @@ static char *find_binary(const char *src)
-
- } while (!end);
-
-- free(path);
- if (newsrc)
- log_debug("find_binary(%s) == %s", src, newsrc);
-+
- return newsrc;
- }
-
-@@ -773,22 +793,20 @@ static int install_all(int argc, char **argv)
- log_debug("Handle '%s'", argv[i]);
-
- if (strchr(argv[i], '/') == NULL) {
-- char *newsrc = find_binary(argv[i]);
-+ _cleanup_free_ char *newsrc = find_binary(argv[i]);
- if (newsrc) {
- log_debug("dracut_install '%s'", newsrc);
- ret = dracut_install(newsrc, newsrc, arg_createdir, arg_resolvedeps, true);
- if (ret == 0) {
- log_debug("dracut_install '%s' OK", newsrc);
- }
-- free(newsrc);
- } else {
- ret = -1;
- }
-
- } else {
-- char *dest = strdup(argv[i]);
-+ _cleanup_free_ char *dest = strdup(argv[i]);
- ret = dracut_install(argv[i], dest, arg_createdir, arg_resolvedeps, true);
-- free(dest);
- }
-
- if ((ret != 0) && (!arg_optional)) {
-diff --git a/install/macro.h b/install/macro.h
-index 1c0aa91..ac61b49 100644
---- a/install/macro.h
-+++ b/install/macro.h
-@@ -1,7 +1,6 @@
- /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
--#ifndef foomacrohfoo
--#define foomacrohfoo
-+#pragma once
-
- /***
- This file is part of systemd.
-@@ -45,16 +44,38 @@
- #define _hidden_ __attribute__ ((visibility("hidden")))
- #define _weakref_(x) __attribute__((weakref(#x)))
- #define _introspect_(x) __attribute__((section("introspect." x)))
-+#define _alignas_(x) __attribute__((aligned(__alignof(x))))
-+#define _cleanup_(x) __attribute__((cleanup(x)))
-+
-+/* automake test harness */
-+#define EXIT_TEST_SKIP 77
-
- #define XSTRINGIFY(x) #x
- #define STRINGIFY(x) XSTRINGIFY(x)
-
- /* Rounds up */
--#define ALIGN(l) ALIGN_TO((l), sizeof(void*))
-+
-+#define ALIGN4(l) (((l) + 3) & ~3)
-+#define ALIGN8(l) (((l) + 7) & ~7)
-+
-+#if __SIZEOF_POINTER__ == 8
-+#define ALIGN(l) ALIGN8(l)
-+#elif __SIZEOF_POINTER__ == 4
-+#define ALIGN(l) ALIGN4(l)
-+#else
-+#error "Wut? Pointers are neither 4 nor 8 bytes long?"
-+#endif
-+
-+#define ALIGN_PTR(p) ((void*) ALIGN((unsigned long) p))
-+#define ALIGN4_PTR(p) ((void*) ALIGN4((unsigned long) p))
-+#define ALIGN8_PTR(p) ((void*) ALIGN8((unsigned long) p))
-+
- static inline size_t ALIGN_TO(size_t l, size_t ali) {
- return ((l + ali - 1) & ~(ali - 1));
- }
-
-+#define ALIGN_TO_PTR(p, ali) ((void*) ALIGN_TO((unsigned long) p))
-+
- #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
-
- /*
-@@ -64,34 +85,35 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
- * @member: the name of the member within the struct.
- *
- */
--#define container_of(ptr, type, member) ({ \
-- const typeof( ((type *)0)->member ) *__mptr = (ptr); \
-- (type *)( (char *)__mptr - offsetof(type,member) );})
-+#define container_of(ptr, type, member) \
-+ __extension__ ({ \
-+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
-+ (type *)( (char *)__mptr - offsetof(type,member) ); \
-+ })
-
--#ifndef MAX
--#define MAX(a,b) \
-- __extension__ ({ \
-- typeof(a) _a = (a); \
-- typeof(b) _b = (b); \
-- _a > _b ? _a : _b; \
-+#undef MAX
-+#define MAX(a,b) \
-+ __extension__ ({ \
-+ typeof(a) _a = (a); \
-+ typeof(b) _b = (b); \
-+ _a > _b ? _a : _b; \
- })
--#endif
-
--#define MAX3(a,b,c) \
-- MAX(MAX(a,b),c)
-+#define MAX3(x,y,z) \
-+ __extension__ ({ \
-+ typeof(x) _c = MAX(x,y); \
-+ MAX(_c, z); \
-+ })
-
--#ifndef MIN
-+#undef MIN
- #define MIN(a,b) \
- __extension__ ({ \
- typeof(a) _a = (a); \
- typeof(b) _b = (b); \
- _a < _b ? _a : _b; \
- })
--#endif
--
--#define MIN3(a,b,c) \
-- MIN(MIN(a,b),c)
-
-+#ifndef CLAMP
- #define CLAMP(x, low, high) \
- __extension__ ({ \
- typeof(x) _x = (x); \
-@@ -99,6 +121,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
- typeof(high) _high = (high); \
- ((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \
- })
-+#endif
-
- #define assert_se(expr) \
- do { \
-@@ -119,14 +142,21 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
- log_assert_failed_unreachable(t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
- } while (false)
-
--#define assert_cc(expr) \
-- do { \
-- switch (0) { \
-- case 0: \
-- case !!(expr): \
-- ; \
-- } \
-+#if defined(static_assert)
-+#define assert_cc(expr) \
-+ do { \
-+ static_assert(expr, #expr); \
-+ } while (false)
-+#else
-+#define assert_cc(expr) \
-+ do { \
-+ switch (0) { \
-+ case 0: \
-+ case !!(expr): \
-+ ; \
-+ } \
- } while (false)
-+#endif
-
- #define PTR_TO_UINT(p) ((unsigned int) ((uintptr_t) (p)))
- #define UINT_TO_PTR(u) ((void*) ((uintptr_t) (u)))
-@@ -149,6 +179,8 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
- #define memzero(x,l) (memset((x), 0, (l)))
- #define zero(x) (memzero(&(x), sizeof(x)))
-
-+#define CHAR_TO_STR(x) ((char[2]) { x, 0 })
-+
- #define char_array_0(x) x[sizeof(x)-1] = 0;
-
- #define IOVEC_SET_STRING(i, s) \
-@@ -187,6 +219,66 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
- return k;
- }
-
--#include "log.h"
-+#define VA_FORMAT_ADVANCE(format, ap) \
-+do { \
-+ int _argtypes[128]; \
-+ size_t _i, _k; \
-+ _k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
-+ assert(_k < ELEMENTSOF(_argtypes)); \
-+ for (_i = 0; _i < _k; _i++) { \
-+ if (_argtypes[_i] & PA_FLAG_PTR) { \
-+ (void) va_arg(ap, void*); \
-+ continue; \
-+ } \
-+ \
-+ switch (_argtypes[_i]) { \
-+ case PA_INT: \
-+ case PA_INT|PA_FLAG_SHORT: \
-+ case PA_CHAR: \
-+ (void) va_arg(ap, int); \
-+ break; \
-+ case PA_INT|PA_FLAG_LONG: \
-+ (void) va_arg(ap, long int); \
-+ break; \
-+ case PA_INT|PA_FLAG_LONG_LONG: \
-+ (void) va_arg(ap, long long int); \
-+ break; \
-+ case PA_WCHAR: \
-+ (void) va_arg(ap, wchar_t); \
-+ break; \
-+ case PA_WSTRING: \
-+ case PA_STRING: \
-+ case PA_POINTER: \
-+ (void) va_arg(ap, void*); \
-+ break; \
-+ case PA_FLOAT: \
-+ case PA_DOUBLE: \
-+ (void) va_arg(ap, double); \
-+ break; \
-+ case PA_DOUBLE|PA_FLAG_LONG_DOUBLE: \
-+ (void) va_arg(ap, long double); \
-+ break; \
-+ default: \
-+ assert_not_reached("Unknown format string argument."); \
-+ } \
-+ } \
-+} while(false)
-+
-+ /* Because statfs.t_type can be int on some architecures, we have to cast
-+ * the const magic to the type, otherwise the compiler warns about
-+ * signed/unsigned comparison, because the magic can be 32 bit unsigned.
-+ */
-+#define F_TYPE_CMP(a, b) (a == (typeof(a)) b)
-
--#endif
-+
-+/* Returns the number of chars needed to format variables of the
-+ * specified type as a decimal string. Adds in extra space for a
-+ * negative '-' prefix. */
-+
-+#define DECIMAL_STR_MAX(type) \
-+ (1+(sizeof(type) <= 1 ? 3 : \
-+ sizeof(type) <= 2 ? 5 : \
-+ sizeof(type) <= 4 ? 10 : \
-+ sizeof(type) <= 8 ? 20 : sizeof(int[-2*(sizeof(type) > 8)])))
-+
-+#include "log.h"
-diff --git a/install/util.h b/install/util.h
-index 9085935..e86b2f2 100644
---- a/install/util.h
-+++ b/install/util.h
-@@ -507,6 +507,42 @@ void* memdup(const void *p, size_t l);
-
- int is_kernel_thread(pid_t pid);
-
-+static inline void freep(void *p) {
-+ free(*(void**) p);
-+}
-+
-+static inline void fclosep(FILE **f) {
-+ if (*f)
-+ fclose(*f);
-+}
-+
-+static inline void pclosep(FILE **f) {
-+ if (*f)
-+ pclose(*f);
-+}
-+
-+static inline void closep(int *fd) {
-+ if (*fd >= 0)
-+ close_nointr_nofail(*fd);
-+}
-+
-+static inline void closedirp(DIR **d) {
-+ if (*d)
-+ closedir(*d);
-+}
-+
-+static inline void umaskp(mode_t *u) {
-+ umask(*u);
-+}
-+
-+#define _cleanup_free_ _cleanup_(freep)
-+#define _cleanup_fclose_ _cleanup_(fclosep)
-+#define _cleanup_pclose_ _cleanup_(pclosep)
-+#define _cleanup_close_ _cleanup_(closep)
-+#define _cleanup_closedir_ _cleanup_(closedirp)
-+#define _cleanup_umask_ _cleanup_(umaskp)
-+#define _cleanup_globfree_ _cleanup_(globfree)
-+
- int fd_inc_sndbuf(int fd, size_t n);
- int fd_inc_rcvbuf(int fd, size_t n);
-
diff --git a/0042-_emergency_shell-Show-current-working-directory-corr.patch b/0042-_emergency_shell-Show-current-working-directory-corr.patch
deleted file mode 100644
index fe40aa2..0000000
--- a/0042-_emergency_shell-Show-current-working-directory-corr.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b6f2e05819d9867b7ca69365091ff480556fcfe9 Mon Sep 17 00:00:00 2001
-From: WANG Chao <chaowang@redhat.com>
-Date: Fri, 26 Apr 2013 15:16:19 +0800
-Subject: [PATCH] _emergency_shell: Show current working directory correctly in
- shell.
-
-When dropped to emergency shell, for example, use rd.break=pre-pivot,
-the PS1 won't correctly show current directory we're in:
-
-pre-pivot:/# cd /sysroot/
-pre-pivot:/#
-(still shows "/")
-
-Let's take a look at PS1 variable:
-
-(I'm adding prefix/suffix 'x' to make it clear):
-pre-pivot:/# echo x${PS1}x
-xpre-pivot:/# x
-(PS1 isn't dynamic)
-
-Regarding the current dracut code, it should be:
-
-pre-pivot:/# cd /sysroot/etc
-pre-pivot:/sysroot/etc#
-
-With this patch:
-
-pre-pivot:/# echo x${PS1}x
-xpre-pivot:${PWD}# x
-(Now PS1 is dynamic, it will show the directory correctly)
-
-I tested for both normal boot and kdump boot.
-
-Signed-off-by: WANG Chao <chaowang@redhat.com>
----
- modules.d/99base/dracut-lib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 9bd25f4..5cb0add 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -926,7 +926,7 @@ _emergency_shell()
- local _name="$1"
- if [ -n "$DRACUT_SYSTEMD" ]; then
- > /.console_lock
-- echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile
-+ echo "PS1=\"$_name:\\\${PWD}# \"" >/etc/profile
- systemctl start dracut-emergency.service
- rm -f /etc/profile
- rm -f /.console_lock
diff --git a/0043-test-use-grep-option-F-and-install-etc-os-release.patch b/0043-test-use-grep-option-F-and-install-etc-os-release.patch
deleted file mode 100644
index 5f5f9e1..0000000
--- a/0043-test-use-grep-option-F-and-install-etc-os-release.patch
+++ /dev/null
@@ -1,584 +0,0 @@
-From 021b2fddff2db93c9936b0fd241b806c270b830a Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 30 Apr 2013 18:54:33 +0200
-Subject: [PATCH] test: use grep option "-F" and install /etc/os-release
-
----
- test/TEST-01-BASIC/test.sh | 5 +++--
- test/TEST-02-SYSTEMD/test.sh | 5 +++--
- test/TEST-03-USR-MOUNT/test.sh | 5 +++--
- test/TEST-04-FULL-SYSTEMD/test.sh | 4 ++--
- test/TEST-10-RAID/test.sh | 7 ++++---
- test/TEST-11-LVM/test.sh | 5 +++--
- test/TEST-12-RAID-DEG/create-root.sh | 2 +-
- test/TEST-12-RAID-DEG/test.sh | 11 ++++++-----
- test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +-
- test/TEST-13-ENC-RAID-LVM/test.sh | 11 ++++++-----
- test/TEST-15-BTRFSRAID/create-root.sh | 10 +++++-----
- test/TEST-15-BTRFSRAID/test.sh | 6 +++---
- test/TEST-16-DMSQUASH/test.sh | 3 ++-
- test/TEST-20-NFS/test.sh | 4 +++-
- test/TEST-30-ISCSI/test.sh | 6 ++++--
- test/TEST-40-NBD/test.sh | 9 ++++++---
- test/TEST-50-MULTINIC/test.sh | 6 ++++--
- test/TEST-99-RPM/test.sh | 2 +-
- test/old.TEST-14-IMSM/test.sh | 4 ++--
- 19 files changed, 62 insertions(+), 45 deletions(-)
-
-diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
-index 84f4b7d..d39556c 100755
---- a/test/TEST-01-BASIC/test.sh
-+++ b/test/TEST-01-BASIC/test.sh
-@@ -16,7 +16,7 @@ test_run() {
- -watchdog i6300esb -watchdog-action poweroff \
- -append "root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing || return 1
-- grep -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
- }
-
- test_setup() {
-@@ -40,6 +40,7 @@ test_setup() {
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- dracut_install grep
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && dracut_install plymouth
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-@@ -74,7 +75,7 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
-
-
- (
-diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
-index 459cf03..c141527 100755
---- a/test/TEST-02-SYSTEMD/test.sh
-+++ b/test/TEST-02-SYSTEMD/test.sh
-@@ -12,7 +12,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=LABEL=dracut rw loglevel=77 systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug init=/sbin/init $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext3 || return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext3 || return 1
- }
-
- test_setup() {
-@@ -36,6 +36,7 @@ test_setup() {
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- dracut_install grep
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && dracut_install plymouth
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-@@ -70,7 +71,7 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/fakeroot rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
-
-
- (
-diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
-index ca7dc12..01a6915 100755
---- a/test/TEST-03-USR-MOUNT/test.sh
-+++ b/test/TEST-03-USR-MOUNT/test.sh
-@@ -29,7 +29,7 @@ client_run() {
- return 1
- fi
-
-- if ! grep -m 1 -q dracut-root-block-success $TESTDIR/result; then
-+ if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
- echo "CLIENT TEST END: $test_name [FAILED]"
- return 1
- fi
-@@ -68,6 +68,7 @@ test_setup() {
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- dracut_install grep
- inst_simple ./fstab /etc/fstab
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && dracut_install plymouth
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-@@ -109,7 +110,7 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/dracut/root rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs || return 1
-
-
- (
-diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
-index d3dc7ef..6c972a3 100755
---- a/test/TEST-04-FULL-SYSTEMD/test.sh
-+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
-@@ -30,7 +30,7 @@ client_run() {
- return 1
- fi
-
-- if ! grep -m 1 -q dracut-root-block-success $TESTDIR/result; then
-+ if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
- echo "CLIENT TEST END: $test_name [FAILED]"
- return 1
- fi
-@@ -251,7 +251,7 @@ EOF
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/fakeroot rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs || return 1
-
-
- (
-diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
-index e11c518..ffce8fc 100755
---- a/test/TEST-10-RAID/test.sh
-+++ b/test/TEST-10-RAID/test.sh
-@@ -14,7 +14,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
-+ grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
- }
-
- test_setup() {
-@@ -35,6 +35,7 @@ test_setup() {
- [ -f ${_terminfodir}/l/linux ] && break
- done
- dracut_install -o ${_terminfodir}/l/linux
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
-@@ -71,8 +72,8 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/cannotreach rw rootfstype=ext2 console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $DISKIMAGE || return 1
-- eval $(grep -a -m 1 ID_FS_UUID $DISKIMAGE)
-+ grep -F -m 1 -q dracut-root-block-created $DISKIMAGE || return 1
-+ eval $(grep -F -a -m 1 ID_FS_UUID $DISKIMAGE)
-
- (
- export initdir=$TESTDIR/overlay
-diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
-index d876e55..65cf588 100755
---- a/test/TEST-11-LVM/test.sh
-+++ b/test/TEST-11-LVM/test.sh
-@@ -13,7 +13,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
- }
-
- test_setup() {
-@@ -34,6 +34,7 @@ test_setup() {
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- dracut_install grep
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && dracut_install plymouth
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-@@ -65,7 +66,7 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
- (
- export initdir=$TESTDIR/overlay
- . $basedir/dracut-functions.sh
-diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
-index 07d0b39..5723b0b 100755
---- a/test/TEST-12-RAID-DEG/create-root.sh
-+++ b/test/TEST-12-RAID-DEG/create-root.sh
-@@ -39,7 +39,7 @@ udevadm settle
- cryptsetup luksClose /dev/mapper/dracut_crypt_test
- udevadm settle
- mdadm -W /dev/md0 || :
--mdadm --detail --export /dev/md0 |grep MD_UUID > /tmp/mduuid
-+mdadm --detail --export /dev/md0 |grep -F MD_UUID > /tmp/mduuid
- . /tmp/mduuid
- eval $(udevadm info --query=env --name=/dev/md0|while read line; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;)
- { echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID; echo "ID_FS_UUID=$ID_FS_UUID";} > /dev/sda1
-diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
-index 1eae41a..1b5e756 100755
---- a/test/TEST-12-RAID-DEG/test.sh
-+++ b/test/TEST-12-RAID-DEG/test.sh
-@@ -21,7 +21,7 @@ client_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "$* root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
- -initrd $TESTDIR/initramfs.testing
-- if ! grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
-+ if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
- echo "CLIENT TEST END: $@ [FAIL]"
- return 1;
- fi
-@@ -32,7 +32,7 @@ client_run() {
- }
-
- test_run() {
-- eval $(grep --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
-+ eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
- echo "MD_UUID=$MD_UUID"
- read LUKS_UUID < $TESTDIR/luksuuid
-
-@@ -75,6 +75,7 @@ test_setup() {
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- dracut_install grep
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && dracut_install plymouth
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-@@ -111,9 +112,9 @@ test_setup() {
- -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
-- eval $(grep --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
-- eval $(grep -a -m 1 ID_FS_UUID $TESTDIR/root.ext2)
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
-+ eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
-+ eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2)
- echo $ID_FS_UUID > $TESTDIR/luksuuid
-
- (
-diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
-index c8b6781..c4c7a17 100755
---- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
-+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
-@@ -48,7 +48,7 @@ cryptsetup luksClose /dev/mapper/dracut_sda4 && \
- {
- echo "dracut-root-block-created"
- for i in /dev/sda[234]; do
-- udevadm info --query=env --name=$i|grep 'ID_FS_UUID='
-+ udevadm info --query=env --name=$i|grep -F 'ID_FS_UUID='
- done
- } >/dev/sda1
- poweroff -f
-diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
-index b8fc7ff..93d48a5 100755
---- a/test/TEST-13-ENC-RAID-LVM/test.sh
-+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
-@@ -21,7 +21,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug rootwait $LUKSARGS $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
- echo "CLIENT TEST END: [OK]"
-
- dd if=/dev/zero of=$TESTDIR/check-success.img bs=1M count=1
-@@ -34,7 +34,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
- echo "CLIENT TEST END: [OK]"
-
- dd if=/dev/zero of=$TESTDIR/check-success.img bs=1M count=1
-@@ -47,7 +47,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL rd.luks.uuid=failme" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
- echo "CLIENT TEST END: [OK]"
-
- return 0
-@@ -72,6 +72,7 @@ test_setup() {
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- dracut_install grep
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && dracut_install plymouth
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-@@ -102,8 +103,8 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
-- cryptoUUIDS=$(grep --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2)
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
-+ cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2)
- for uuid in $cryptoUUIDS; do
- eval $uuid
- printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID
-diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
-index cd51935..69f9280 100755
---- a/test/TEST-15-BTRFSRAID/create-root.sh
-+++ b/test/TEST-15-BTRFSRAID/create-root.sh
-@@ -5,15 +5,15 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
- done
- udevadm control --reload
- # save a partition at the beginning for future flagging purposes
--sfdisk -C 655600 -H 2 -S 32 -L /dev/sda <<EOF
-+sfdisk -C 327800 -H 2 -S 32 -L /dev/sda <<EOF
- ,16
- ,,E
- ;
- ;
--,10240
--,10240
--,10240
--,10240
-+,5120
-+,5120
-+,5120
-+,5120
- EOF
- mkfs.btrfs -draid10 -mraid10 -L root /dev/sda5 /dev/sda6 /dev/sda7 /dev/sda8
- udevadm settle
-diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
-index 8f013d5..6d44fbc 100755
---- a/test/TEST-15-BTRFSRAID/test.sh
-+++ b/test/TEST-15-BTRFSRAID/test.sh
-@@ -13,14 +13,14 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
-+ dd if=$DISKIMAGE bs=512 count=2 | grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
- }
-
- test_setup() {
- # Create the blank file to use as a root filesystem
- DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
- rm -f $DISKIMAGE
-- dd if=/dev/null of=$DISKIMAGE bs=2M seek=1024
-+ dd if=/dev/null of=$DISKIMAGE bs=1M seek=1024
-
- kernel=$KVERSION
- # Create what will eventually be our root filesystem onto an overlay
-@@ -72,7 +72,7 @@ test_setup() {
- -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-
-- grep -m 1 -q dracut-root-block-created $DISKIMAGE || return 1
-+ dd if=$DISKIMAGE bs=512 count=2 | grep -F -m 1 -q dracut-root-block-created || return 1
-
- (
- export initdir=$TESTDIR/overlay
-diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
-index 1f0854e..074ec28 100755
---- a/test/TEST-16-DMSQUASH/test.sh
-+++ b/test/TEST-16-DMSQUASH/test.sh
-@@ -23,7 +23,7 @@ test_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "root=live:CDLABEL=LiveCD live rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- grep -m 1 -q dracut-root-block-success $TESTDIR/root.img || return 1
-+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.img || return 1
- }
-
- test_setup() {
-@@ -62,6 +62,7 @@ test_setup() {
- for f in /usr/share/syslinux/*; do
- inst_simple "$f"
- done
-+ inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- inst $TESTDIR/initramfs.testing "/boot/initramfs-$KVERSION.img"
- inst /boot/vmlinuz-$KVERSION
-diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
-index 2b8a2ec..859fe06 100755
---- a/test/TEST-20-NFS/test.sh
-+++ b/test/TEST-20-NFS/test.sh
-@@ -62,7 +62,7 @@ client_test() {
- -append "$cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet ro console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.testing
-
-- if [[ $? -ne 0 ]] || ! grep -m 1 -q nfs-OK $TESTDIR/client.img; then
-+ if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nfs-OK $TESTDIR/client.img; then
- echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
- return 1
- fi
-@@ -250,6 +250,7 @@ test_setup() {
- [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
- instmods nfsd sunrpc ipv6 lockd af_packet
- inst ./server-init.sh /sbin/init
-+ inst_simple /etc/os-release
- inst ./hosts /etc/hosts
- inst ./exports /etc/exports
- inst ./dhcpd.conf /etc/dhcpd.conf
-@@ -296,6 +297,7 @@ test_setup() {
- done
- dracut_install -o ${_terminfodir}/l/linux
- inst ./client-init.sh /sbin/init
-+ inst_simple /etc/os-release
- (
- cd "$initdir"
- mkdir -p dev sys proc etc run
-diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
-index f9502e0..990f7ba 100755
---- a/test/TEST-30-ISCSI/test.sh
-+++ b/test/TEST-30-ISCSI/test.sh
-@@ -48,7 +48,7 @@ run_client() {
- -kernel /boot/vmlinuz-$KVERSION \
- -append "$* rw quiet rd.auto rd.retry=5 rd.debug rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- if ! grep -m 1 -q iscsi-OK $TESTDIR/client.img; then
-+ if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
- echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
- return 1
- fi
-@@ -111,6 +111,7 @@ test_setup() {
- [ -f ${_terminfodir}/l/linux ] && break
- done
- dracut_install -o ${_terminfodir}/l/linux
-+ inst_simple /etc/os-release
- inst ./client-init.sh /sbin/init
- (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
- cp -a /etc/ld.so.conf* $initdir/etc
-@@ -152,7 +153,7 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/fakeroot rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
- rm $TESTDIR/client.img
- (
- export initdir=$TESTDIR/overlay
-@@ -196,6 +197,7 @@ test_setup() {
- [ -f /etc/netconfig ] && dracut_install /etc/netconfig
- type -P dhcpd >/dev/null && dracut_install dhcpd
- [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
-+ inst_simple /etc/os-release
- inst ./server-init.sh /sbin/init
- inst ./hosts /etc/hosts
- inst ./dhcpd.conf /etc/dhcpd.conf
-diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
-index 208b784..9ad95b9 100755
---- a/test/TEST-40-NBD/test.sh
-+++ b/test/TEST-40-NBD/test.sh
-@@ -64,7 +64,7 @@ client_test() {
- -append "$cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \
- -initrd $TESTDIR/initramfs.testing
-
-- if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK $TESTDIR/flag.img; then
-+ if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nbd-OK $TESTDIR/flag.img; then
- echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
- return 1
- fi
-@@ -205,6 +205,7 @@ make_encrypted_root() {
- done
- dracut_install -o ${_terminfodir}/l/linux
- inst ./client-init.sh /sbin/init
-+ inst_simple /etc/os-release
- find_binary plymouth >/dev/null && dracut_install plymouth
- cp -a /etc/ld.so.conf* $initdir/etc
- sudo ldconfig -r "$initdir"
-@@ -239,8 +240,8 @@ make_encrypted_root() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
-- grep -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
-+ grep -F -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid
- }
-
- make_client_root() {
-@@ -262,6 +263,7 @@ make_client_root() {
- done
- dracut_install -o ${_terminfodir}/l/linux
- inst ./client-init.sh /sbin/init
-+ inst_simple /etc/os-release
- inst /etc/nsswitch.conf /etc/nsswitch.conf
- inst /etc/passwd /etc/passwd
- inst /etc/group /etc/group
-@@ -303,6 +305,7 @@ make_server_root() {
- type -P dhcpd >/dev/null && dracut_install dhcpd
- [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
- inst ./server-init.sh /sbin/init
-+ inst_simple /etc/os-release
- inst ./hosts /etc/hosts
- inst ./dhcpd.conf /etc/dhcpd.conf
- inst /etc/nsswitch.conf /etc/nsswitch.conf
-diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
-index 5cb0971..e2a8ab9 100755
---- a/test/TEST-50-MULTINIC/test.sh
-+++ b/test/TEST-50-MULTINIC/test.sh
-@@ -61,7 +61,7 @@ client_test() {
- -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
-+ if [[ $? -ne 0 ]] || ! grep -F -m 1 -q OK $TESTDIR/client.img; then
- echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
- return 1
- fi
-@@ -69,7 +69,7 @@ client_test() {
-
- for i in $check ; do
- echo $i
-- if ! grep -m 1 -q $i $TESTDIR/client.img; then
-+ if ! grep -F -m 1 -q $i $TESTDIR/client.img; then
- echo "CLIENT TEST END: $test_name [FAILED - BAD IF]"
- return 1
- fi
-@@ -170,6 +170,7 @@ test_setup() {
- type -P dhcpd >/dev/null && dracut_install dhcpd
- [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
- instmods nfsd sunrpc ipv6 lockd af_packet
-+ inst_simple /etc/os-release
- inst ./server-init.sh /sbin/init
- inst ./hosts /etc/hosts
- inst ./exports /etc/exports
-@@ -208,6 +209,7 @@ test_setup() {
- [ -f ${_terminfodir}/l/linux ] && break
- done
- dracut_install -o ${_terminfodir}/l/linux
-+ inst_simple /etc/os-release
- inst ./client-init.sh /sbin/init
- (
- cd "$initdir"
-diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
-index f030cb0..8ae7f8e 100755
---- a/test/TEST-99-RPM/test.sh
-+++ b/test/TEST-99-RPM/test.sh
-@@ -53,7 +53,7 @@ find / -xdev -type f -not -path '/var/*' \
- -not -path '/boot/*0-rescue*' \
- -not -path '/dev/null' \
- -exec rpm -qf '{}' ';' | \
-- fgrep 'not owned' &> /test.output
-+ grep -F 'not owned' &> /test.output
- exit
- EOF
-
-diff --git a/test/old.TEST-14-IMSM/test.sh b/test/old.TEST-14-IMSM/test.sh
-index cd2d715..d69f00d 100755
---- a/test/old.TEST-14-IMSM/test.sh
-+++ b/test/old.TEST-14-IMSM/test.sh
-@@ -17,7 +17,7 @@ client_run() {
- -net none -kernel /boot/vmlinuz-$KVERSION \
- -append "$@ root=LABEL=root rw quiet rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
-- if ! grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
-+ if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
- echo "CLIENT TEST END: $@ [FAIL]"
- return 1;
- fi
-@@ -102,7 +102,7 @@ test_setup() {
- -kernel "/boot/vmlinuz-$kernel" \
- -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
-- grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
-+ grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
- (
- export initdir=$TESTDIR/overlay
- . $basedir/dracut-functions.sh
diff --git a/0044-zfcp-match-udev-rule-against-KERNEL-zfcp.patch b/0044-zfcp-match-udev-rule-against-KERNEL-zfcp.patch
deleted file mode 100644
index 18bdaf5..0000000
--- a/0044-zfcp-match-udev-rule-against-KERNEL-zfcp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 9584c6ae903fe6918f4a6b3ad0a5a295c1dbdc18 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 30 Apr 2013 18:55:12 +0200
-Subject: [PATCH] zfcp: match udev rule against KERNEL=="zfcp"
-
-zfcp_cfdc will go away in the future
-
- tt
----
- modules.d/95zfcp/56-zfcp.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/95zfcp/56-zfcp.rules b/modules.d/95zfcp/56-zfcp.rules
-index 5e846a4..5558f8b 100644
---- a/modules.d/95zfcp/56-zfcp.rules
-+++ b/modules.d/95zfcp/56-zfcp.rules
-@@ -1 +1 @@
--KERNEL=="zfcp_cfdc", RUN+="/sbin/zfcpconf.sh"
-+KERNEL=="zfcp", RUN+="/sbin/zfcpconf.sh"
diff --git a/0045-usrmount-Fix-miss-detection-of-btrfs-subvolumes.patch b/0045-usrmount-Fix-miss-detection-of-btrfs-subvolumes.patch
deleted file mode 100644
index 1521d6e..0000000
--- a/0045-usrmount-Fix-miss-detection-of-btrfs-subvolumes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d57b8833c43d297004d8393d8e54a2ab2655a899 Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Fri, 3 May 2013 17:16:05 +0100
-Subject: [PATCH] usrmount: Fix miss-detection of btrfs subvolumes.
-
-This causes the root FS options to be incorrectly applied to to /usr
-In some cases this can cause boot failure e.g. due to and XFS /usr
-not supporting the 'acl' option from the ext4 root FS.
-
-https://bugs.mageia.org/show_bug.cgi?id=9884
----
- modules.d/98usrmount/mount-usr.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index a4a66ae..de7dcc2 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -61,14 +61,14 @@ mount_usr()
- LABEL=*)
- _dev="$(echo $_dev | sed 's,/,\\x2f,g')"
- _dev="/dev/disk/by-label/${_dev#LABEL=}"
-- ;;
-+ ;;
- UUID=*)
- _dev="${_dev#block:}"
- _dev="/dev/disk/by-uuid/${_dev#UUID=}"
- ;;
- esac
- if strstr "$_opts" "subvol=" && \
-- [ "${root#block:}" -ef $_dev ]
-+ [ "${root#block:}" -ef $_dev ] && \
- [ -n "$rflags" ]; then
- # for btrfs subvolumes we have to mount /usr with the same rflags
- rflags=$(filtersubvol "$rflags")
diff --git a/0046-dracut.sh-degrade-message-about-missing-tools-for-st.patch b/0046-dracut.sh-degrade-message-about-missing-tools-for-st.patch
deleted file mode 100644
index 63cbb9e..0000000
--- a/0046-dracut.sh-degrade-message-about-missing-tools-for-st.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fefd3f66f9802f3309c44f45e4959e5fa6683a07 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 6 May 2013 14:06:29 +0200
-Subject: [PATCH] dracut.sh: degrade message about missing tools for stripping
-
-warning -> info
-
-https://bugzilla.redhat.com/show_bug.cgi?id=958519
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 5f0a1b3..88b0645 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1162,7 +1162,7 @@ fi
- if [[ $do_strip = yes ]] ; then
- for p in strip xargs find; do
- if ! type -P $p >/dev/null; then
-- dwarn "Could not find '$p'. Not stripping the initramfs."
-+ dinfo "Could not find '$p'. Not stripping the initramfs."
- do_strip=no
- fi
- done
diff --git a/0047-don-t-specify-p-as-a-separator-for-dmraid-arrays-RHB.patch b/0047-don-t-specify-p-as-a-separator-for-dmraid-arrays-RHB.patch
deleted file mode 100644
index 85eeca9..0000000
--- a/0047-don-t-specify-p-as-a-separator-for-dmraid-arrays-RHB.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d7c07f191524f2ac59e3083910db985fa4bbcd5 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Wed, 22 May 2013 13:56:58 -0700
-Subject: [PATCH] don't specify "p" as a separator for dmraid arrays (RHBZ
- #966162)
-
-As per RHBZ #966162, parted stopped unconditionally using "p" as a
-separator for dmraid device names in version 3.1, so other things need
-to fall in line with that convention now.
----
- modules.d/90dmraid/dmraid.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
-index 68e0515..3753ddd 100755
---- a/modules.d/90dmraid/dmraid.sh
-+++ b/modules.d/90dmraid/dmraid.sh
-@@ -28,7 +28,7 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
- if [ "${s##$r}" != "$s" ]; then
- info "Activating $s"
- dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
-- [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo
-+ [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
- udevsettle
- fi
- done
-@@ -38,7 +38,7 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
- for s in $SETS; do
- info "Activating $s"
- dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
-- [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo
-+ [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
- done
- fi
-
diff --git a/0048-systemd-set-environment-vars-DRACUT_SYSTEMD-NEWROOT-.patch b/0048-systemd-set-environment-vars-DRACUT_SYSTEMD-NEWROOT-.patch
deleted file mode 100644
index f42ecba..0000000
--- a/0048-systemd-set-environment-vars-DRACUT_SYSTEMD-NEWROOT-.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 780cb337416a21b000353d1f2dbb362690265b3b Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 12:50:57 +0200
-Subject: [PATCH] systemd: set environment vars DRACUT_SYSTEMD, NEWROOT in
- service file
-
----
- modules.d/98systemd/dracut-cmdline.service | 2 ++
- modules.d/98systemd/dracut-cmdline.sh | 2 --
- modules.d/98systemd/dracut-emergency.service | 2 ++
- modules.d/98systemd/dracut-initqueue.service | 2 ++
- modules.d/98systemd/dracut-mount.service | 2 ++
- modules.d/98systemd/dracut-pre-mount.service | 2 ++
- modules.d/98systemd/dracut-pre-pivot.service | 2 ++
- modules.d/98systemd/dracut-pre-trigger.service | 2 ++
- modules.d/98systemd/dracut-pre-udev.service | 2 ++
- modules.d/98systemd/emergency.service | 2 ++
- modules.d/98systemd/rescue.service | 2 ++
- 11 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/98systemd/dracut-cmdline.service b/modules.d/98systemd/dracut-cmdline.service
-index 33a37f9..07f6939 100644
---- a/modules.d/98systemd/dracut-cmdline.service
-+++ b/modules.d/98systemd/dracut-cmdline.service
-@@ -23,6 +23,8 @@ ConditionKernelCommandLine=|resume
- ConditionKernelCommandLine=|noresume
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-cmdline
- StandardInput=null
-diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh
-index ad51142..a6738bd 100755
---- a/modules.d/98systemd/dracut-cmdline.sh
-+++ b/modules.d/98systemd/dracut-cmdline.sh
-@@ -2,8 +2,6 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
-
--export DRACUT_SYSTEMD=1
--export NEWROOT="/sysroot"
- [ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT
- [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
- [ -d /run/lock ] || mkdir -p -m 0755 /run/lock
-diff --git a/modules.d/98systemd/dracut-emergency.service b/modules.d/98systemd/dracut-emergency.service
-index 153931b..12eef6c 100644
---- a/modules.d/98systemd/dracut-emergency.service
-+++ b/modules.d/98systemd/dracut-emergency.service
-@@ -16,6 +16,8 @@ Conflicts=emergency.service emergency.target
-
- [Service]
- Environment=HOME=/
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- WorkingDirectory=/
- ExecStart=/bin/dracut-emergency
- ExecStopPost=-/bin/rm -f /.console_lock
-diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service
-index c19cfea..f4c1dd4 100644
---- a/modules.d/98systemd/dracut-initqueue.service
-+++ b/modules.d/98systemd/dracut-initqueue.service
-@@ -19,6 +19,8 @@ ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/*.sh
- ConditionKernelCommandLine=|rd.break=pre-mount
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-initqueue
- StandardInput=null
-diff --git a/modules.d/98systemd/dracut-mount.service b/modules.d/98systemd/dracut-mount.service
-index db18f86..20c633d 100644
---- a/modules.d/98systemd/dracut-mount.service
-+++ b/modules.d/98systemd/dracut-mount.service
-@@ -17,6 +17,8 @@ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/mount
- ConditionKernelCommandLine=|rd.break=mount
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-mount
- StandardInput=null
-diff --git a/modules.d/98systemd/dracut-pre-mount.service b/modules.d/98systemd/dracut-pre-mount.service
-index bec3c75..d7be48d 100644
---- a/modules.d/98systemd/dracut-pre-mount.service
-+++ b/modules.d/98systemd/dracut-pre-mount.service
-@@ -19,6 +19,8 @@ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-mount
- ConditionKernelCommandLine=|rd.break=pre-mount
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-mount
- StandardInput=null
-diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service
-index 9d0143c..36394aa 100644
---- a/modules.d/98systemd/dracut-pre-pivot.service
-+++ b/modules.d/98systemd/dracut-pre-pivot.service
-@@ -18,6 +18,8 @@ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-pivot
- ConditionKernelCommandLine=|rd.break=pre-pivot
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-pivot
- StandardInput=null
-diff --git a/modules.d/98systemd/dracut-pre-trigger.service b/modules.d/98systemd/dracut-pre-trigger.service
-index e49e405..bb34196 100644
---- a/modules.d/98systemd/dracut-pre-trigger.service
-+++ b/modules.d/98systemd/dracut-pre-trigger.service
-@@ -19,6 +19,8 @@ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-trigger
- ConditionKernelCommandLine=|rd.break=pre-trigger
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-trigger
- StandardInput=null
-diff --git a/modules.d/98systemd/dracut-pre-udev.service b/modules.d/98systemd/dracut-pre-udev.service
-index b372373..d125b37 100644
---- a/modules.d/98systemd/dracut-pre-udev.service
-+++ b/modules.d/98systemd/dracut-pre-udev.service
-@@ -22,6 +22,8 @@ ConditionKernelCommandLine=|rd.driver.pre
- ConditionKernelCommandLine=|rd.driver.post
-
- [Service]
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-udev
- StandardInput=null
-diff --git a/modules.d/98systemd/emergency.service b/modules.d/98systemd/emergency.service
-index a932739..35d9c31 100644
---- a/modules.d/98systemd/emergency.service
-+++ b/modules.d/98systemd/emergency.service
-@@ -15,6 +15,8 @@ Wants=systemd-vconsole-setup.service
-
- [Service]
- Environment=HOME=/
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- WorkingDirectory=/
- ExecStart=/bin/dracut-emergency
- ExecStopPost=-/usr/bin/systemctl --fail --no-block default
-diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service
-index b5fb663..62f2067 100644
---- a/modules.d/98systemd/rescue.service
-+++ b/modules.d/98systemd/rescue.service
-@@ -13,6 +13,8 @@ DefaultDependencies=no
-
- [Service]
- Environment=HOME=/
-+Environment=DRACUT_SYSTEMD=1
-+Environment=NEWROOT=/sysroot
- WorkingDirectory=/
- ExecStartPre=-/bin/plymouth quit
- ExecStart=-/bin/sh -i -l
diff --git a/0049-don-t-add-volatile-swap-partitions-to-host_devs.patch b/0049-don-t-add-volatile-swap-partitions-to-host_devs.patch
deleted file mode 100644
index b88dbd5..0000000
--- a/0049-don-t-add-volatile-swap-partitions-to-host_devs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From bcfbddefe13d179d553da77cf66ada5e6fd804c8 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 13:26:05 +0200
-Subject: [PATCH] don't add volatile swap partitions to host_devs
-
----
- TODO | 1 +
- dracut.sh | 17 ++++++++++++-----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/TODO b/TODO
-index 9eeedfa..e275324 100644
---- a/TODO
-+++ b/TODO
-@@ -22,6 +22,7 @@ INITRAMFS TODO
-
- GENERATOR TODO
-
-+- remove wait for swap devs, if no "resume=" is given on the kernel command line
- - add presets (predefined set of modules)
- - add interpreter/plugin-scripts to be sourced at the beginning or end (can use dracut-functions)
- - add mechanism for module specific command line options
-diff --git a/dracut.sh b/dracut.sh
-index 88b0645..7481ac0 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -830,7 +830,7 @@ if [[ $hostonly ]]; then
- # in hostonly mode, determine all devices, which have to be accessed
- # and examine them for filesystem types
-
-- push host_mp \
-+ for mp in \
- "/" \
- "/etc" \
- "/usr" \
-@@ -838,9 +838,8 @@ if [[ $hostonly ]]; then
- "/usr/sbin" \
- "/usr/lib" \
- "/usr/lib64" \
-- "/boot"
--
-- for mp in "${host_mp[@]}"; do
-+ "/boot";
-+ do
- mountpoint "$mp" >/dev/null 2>&1 || continue
- push host_devs $(readlink -f "/dev/block/$(find_block_device "$mp")")
- done
-@@ -856,11 +855,19 @@ if [[ $hostonly ]]; then
- [[ "$_d" == UUID\=* ]] && _d="/dev/disk/by-uuid/${_d#UUID=}"
- [[ "$_d" == LABEL\=* ]] && _d="/dev/disk/by-label/$_d#LABEL=}"
- [[ "$_d" -ef "$dev" ]] || continue
-+
-+ while read _mapper _a _p _o; do
-+ [[ $_mapper = \#* ]] && continue
-+ [[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue
-+ [[ "$_o" ]] || _o="$_p"
-+ # skip mkswap swap
-+ [[ $_o == *swap* ]] && continue 2
-+ done < /etc/crypttab
-+
- push host_devs $(readlink -f $dev)
- break
- done < /etc/fstab
- done < /proc/swaps
--
- fi
-
- _get_fs_type() (
diff --git a/0050-dracut-functions.sh-clarify-instmods-error-message.patch b/0050-dracut-functions.sh-clarify-instmods-error-message.patch
deleted file mode 100644
index 2ee07dc..0000000
--- a/0050-dracut-functions.sh-clarify-instmods-error-message.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 19b5c10963e80cc6899ee4131474c1955754f8c6 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 14:25:49 +0200
-Subject: [PATCH] dracut-functions.sh: clarify instmods() error message
-
----
- dracut-functions.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 96d3c6e..4a0e81a 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -1608,7 +1608,7 @@ instmods() {
- while read _mod; do
- inst1mod "${_mod%.ko*}" || {
- if [[ "$_check" == "yes" ]]; then
-- [[ "$_silent" == "no" ]] && dfatal "Failed to install $_mod"
-+ [[ "$_silent" == "no" ]] && dfatal "Failed to install module $_mod"
- return 1
- fi
- }
-@@ -1617,7 +1617,7 @@ instmods() {
- while (($# > 0)); do # filenames as arguments
- inst1mod ${1%.ko*} || {
- if [[ "$_check" == "yes" ]]; then
-- [[ "$_silent" == "no" ]] && dfatal "Failed to install $1"
-+ [[ "$_silent" == "no" ]] && dfatal "Failed to install module $1"
- return 1
- fi
- }
diff --git a/0051-01fips-module-setup.sh-add-libssl.so.10-to-make-kdum.patch b/0051-01fips-module-setup.sh-add-libssl.so.10-to-make-kdum.patch
deleted file mode 100644
index d6bde39..0000000
--- a/0051-01fips-module-setup.sh-add-libssl.so.10-to-make-kdum.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 15b93069bba031169eeccb8b16fe0382a4bb2968 Mon Sep 17 00:00:00 2001
-From: Baoquan He <bhe@redhat.com>
-Date: Thu, 9 May 2013 16:38:53 +0800
-Subject: [PATCH] 01fips/module-setup.sh: add libssl.so.10 to make kdump work
- with fips mode
-
-FIPS can work well in 1st kernel, but failed in kdump kernel. the
-libssl.so.10 and related hmac file are needed. Now add it and it
-works.
-
-Signed-off-by: Baoquan He <bhe@redhat.com>
----
- modules.d/01fips/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index a7f5be8..6013318 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -38,7 +38,7 @@ install() {
-
- inst_libdir_file libsoftokn3.so libsoftokn3.so \
- libsoftokn3.chk libfreebl3.so libfreebl3.chk \
-- libssl.so 'hmaccalc/sha512hmac.hmac'
-+ libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10
-
- dracut_install -o prelink
- }
diff --git a/0052-Fix-parsing-command-line-arguments.patch b/0052-Fix-parsing-command-line-arguments.patch
deleted file mode 100644
index 7312b85..0000000
--- a/0052-Fix-parsing-command-line-arguments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6a736cc129ed29157a4e5460382d17154f8fc381 Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Sat, 11 May 2013 11:39:46 +0200
-Subject: [PATCH] Fix parsing command line arguments
-
-Adjust correctly the *optstring argument of getopt_long. Add support
-for a missing option -v|--verbose and drop unknown options -D, -I and -L.
----
- install/dracut-install.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index b4bf681..584a30b 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -619,7 +619,7 @@ static int parse_argv(int argc, char *argv[])
- {NULL, 0, NULL, 0}
- };
-
-- while ((c = getopt_long(argc, argv, "adhloD:DHILR", options, NULL)) != -1) {
-+ while ((c = getopt_long(argc, argv, "adhloD:HR", options, NULL)) != -1) {
- switch (c) {
- case ARG_VERSION:
- puts(PROGRAM_VERSION_STRING);
diff --git a/0053-Introduce-stricter-type-correctness.patch b/0053-Introduce-stricter-type-correctness.patch
deleted file mode 100644
index 0e768a8..0000000
--- a/0053-Introduce-stricter-type-correctness.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 599182b10870a826360091246f0a5f26c691f690 Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Sat, 11 May 2013 17:06:45 +0200
-Subject: [PATCH] Introduce stricter type correctness
-
----
- install/dracut-install.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 584a30b..33fad4a 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -80,9 +80,9 @@ static char *convert_abs_rel(const char *from, const char *target)
- _cleanup_free_ char *realtarget = NULL;
- _cleanup_free_ char *target_dir_p = NULL, *realpath_p = NULL;
- const char *realfrom = from;
-- int level = 0, fromlevel = 0, targetlevel = 0;
-- int l, i, rl;
-- int dirlen;
-+ size_t level = 0, fromlevel = 0, targetlevel = 0;
-+ int l;
-+ size_t i, rl, dirlen;
-
- target_dir_p = strdup(target);
- if (!target_dir_p)
-@@ -215,7 +215,7 @@ static int cp(const char *src, const char *dst)
- if (ret == 0) {
- struct timeval tv[2];
- if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0)
-- fchown(dest_desc, -1, sb.st_gid);
-+ fchown(dest_desc, (__uid_t)-1, sb.st_gid);
- tv[0].tv_sec = sb.st_atime;
- tv[0].tv_usec = 0;
- tv[1].tv_sec = sb.st_mtime;
-@@ -297,7 +297,7 @@ static int resolve_deps(const char *src)
- log_debug("ldd: '%s'", buf);
-
- if (strstr(buf, "you do not have execution permission")) {
-- log_error(buf);
-+ log_error("%s", buf);
- ret+=1;
- break;
- }
-@@ -670,7 +670,7 @@ static int parse_argv(int argc, char *argv[])
- static int resolve_lazy(int argc, char **argv)
- {
- int i;
-- int destrootdirlen = strlen(destrootdir);
-+ size_t destrootdirlen = strlen(destrootdir);
- int ret = 0;
- char *item;
- for (i = 0; i < argc; i++) {
diff --git a/0054-Use-consistiently-termination-code-macros.patch b/0054-Use-consistiently-termination-code-macros.patch
deleted file mode 100644
index 689e4b6..0000000
--- a/0054-Use-consistiently-termination-code-macros.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8974102f6b4d59a29e01d080262cbbb0a08571d3 Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Sat, 11 May 2013 13:49:00 +0200
-Subject: [PATCH] Use consistiently termination code macros
-
-Operate in install_all and install_one consequently on EXIT_SUCCESS
-and EXIT_FAILURE termination code macros as they are meant to be
-returned from these functions.
----
- install/dracut-install.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 33fad4a..0b9502e 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -757,7 +757,7 @@ static char *find_binary(const char *src)
-
- static int install_one(const char *src, const char *dst)
- {
-- int r = 0;
-+ int r = EXIT_SUCCESS;
- int ret;
-
- if (strchr(src, '/') == NULL) {
-@@ -786,7 +786,7 @@ static int install_one(const char *src, const char *dst)
-
- static int install_all(int argc, char **argv)
- {
-- int r = 0;
-+ int r = EXIT_SUCCESS;
- int i;
- for (i = 0; i < argc; i++) {
- int ret;
diff --git a/0055-Always-check-the-return-number-of-asprintf.patch b/0055-Always-check-the-return-number-of-asprintf.patch
deleted file mode 100644
index 4c06740..0000000
--- a/0055-Always-check-the-return-number-of-asprintf.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From d9eff33ce203a9010067a15ddf1d279132abf437 Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Sat, 11 May 2013 14:40:19 +0200
-Subject: [PATCH] Always check the return number of asprintf
-
-asprintf prints to an allocated string. When successful, the
-functions return the number of bytes printed. If memory allocation
-wasn't possible, or some other error occurs, the function will return
--1.
-
-Don't check strp as a result of asprintf, it's content may be undefined.
-
-man 3 asprintf
----
- install/dracut-install.c | 59 +++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 48 insertions(+), 11 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 0b9502e..c8328b0 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -83,6 +83,7 @@ static char *convert_abs_rel(const char *from, const char *target)
- size_t level = 0, fromlevel = 0, targetlevel = 0;
- int l;
- size_t i, rl, dirlen;
-+ int ret;
-
- target_dir_p = strdup(target);
- if (!target_dir_p)
-@@ -103,7 +104,11 @@ static char *convert_abs_rel(const char *from, const char *target)
- for (i = dirlen+1; i < rl; ++i)
- if (target_dir_p[i] != '/')
- break;
-- asprintf(&realtarget, "%s/%s", realpath_p, &target_dir_p[i]);
-+ ret = asprintf(&realtarget, "%s/%s", realpath_p, &target_dir_p[i]);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-
- /* now calculate the relative path from <from> to <target> and
- store it in <relative_from>
-@@ -282,8 +287,11 @@ static int resolve_deps(const char *src)
-
- /* run ldd */
- ret = asprintf(&cmd, "ldd %s 2>&1", src);
-- if (ret < 0)
-- return ret;
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-+
- ret = 0;
-
- fptr = popen(cmd, "r");
-@@ -352,6 +360,7 @@ static int hmac_install(const char *src, const char *dst, const char *hmacpath)
- _cleanup_free_ char *dstpath = strdup(dst);
- _cleanup_free_ char *srchmacname = NULL;
- _cleanup_free_ char *dsthmacname = NULL;
-+ int ret;
-
- if (!(srcpath && dstpath))
- return -ENOMEM;
-@@ -371,11 +380,29 @@ static int hmac_install(const char *src, const char *dst, const char *hmacpath)
- srcpath[dlen] = '\0';
- dstpath[dir_len(dst)] = '\0';
- if (hmacpath) {
-- asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-- asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-+ ret = asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ ret = asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
- } else {
-- asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
-- asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
-+ ret = asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ ret = asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
- }
- log_debug("hmac cp '%s' '%s')", srchmacname, dsthmacname);
- dracut_install(srchmacname, dsthmacname, false, false, true);
-@@ -428,7 +455,11 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
-
- hashmap_put(items, i, i);
-
-- asprintf(&fulldstpath, "%s%s", destrootdir, dst);
-+ ret = asprintf(&fulldstpath, "%s%s", destrootdir, dst);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-
- ret = stat(fulldstpath, &sb);
-
-@@ -511,7 +542,11 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
- if (lstat(fulldstpath, &sb) != 0) {
- _cleanup_free_ char *absdestpath = NULL;
-
-- asprintf(&absdestpath, "%s%s", destrootdir, abspath);
-+ ret = asprintf(&absdestpath, "%s%s", destrootdir, abspath);
-+ if (ret < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-
- ln_r(absdestpath, fulldstpath);
- }
-@@ -704,6 +739,8 @@ static char *find_binary(const char *src)
- char *p, *q;
- bool end = false;
- char *newsrc = NULL;
-+ int ret;
-+
- path = getenv("PATH");
-
- if (path == NULL) {
-@@ -730,8 +767,8 @@ static char *find_binary(const char *src)
- else
- *q = '\0';
-
-- asprintf(&newsrc, "%s/%s", p, src);
-- if (newsrc == NULL) {
-+ ret = asprintf(&newsrc, "%s/%s", p, src);
-+ if (ret < 0) {
- log_error("Out of memory!");
- exit(EXIT_FAILURE);
- }
diff --git a/0056-Fix-memory-leak.patch b/0056-Fix-memory-leak.patch
deleted file mode 100644
index ec01dc6..0000000
--- a/0056-Fix-memory-leak.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e0904b27ff821c067ae62c227db8fef45638a827 Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Sat, 11 May 2013 14:54:38 +0200
-Subject: [PATCH] Fix memory leak
-
----
- install/dracut-install.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index c8328b0..a1c6461 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -258,7 +258,7 @@ static int resolve_deps(const char *src)
- {
- int ret = 0;
-
-- char *buf = malloc(LINE_MAX);
-+ _cleanup_free_ char *buf = malloc(LINE_MAX);
- size_t linesize = LINE_MAX;
- _cleanup_pclose_ FILE *fptr = NULL;
- _cleanup_free_ char *cmd = NULL;
diff --git a/0057-dracut.spec-put-selinux-for-kdump-crash-file-context.patch b/0057-dracut.spec-put-selinux-for-kdump-crash-file-context.patch
deleted file mode 100644
index 8aa1494..0000000
--- a/0057-dracut.spec-put-selinux-for-kdump-crash-file-context.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 639bd4873bed9b29967b2ff21b90891d00667f92 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 15:40:45 +0200
-Subject: [PATCH] dracut.spec: put selinux for kdump crash file contexts
-
----
- dracut.spec | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/dracut.spec b/dracut.spec
-index 3d42af2..a475e08 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -231,7 +231,6 @@ rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
- rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs
- rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
- rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
--rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98selinux
- %endif
-
- mkdir -p $RPM_BUILD_ROOT/boot/dracut
-@@ -348,12 +347,12 @@ rm -rf $RPM_BUILD_ROOT
- %if %{undefined _unitdir}
- %{dracutlibdir}/modules.d/96securityfs
- %{dracutlibdir}/modules.d/97masterkey
--%{dracutlibdir}/modules.d/98selinux
- %{dracutlibdir}/modules.d/98integrity
- %endif
- %{dracutlibdir}/modules.d/97biosdevname
- %{dracutlibdir}/modules.d/98ecryptfs
- %{dracutlibdir}/modules.d/98pollcdrom
-+%{dracutlibdir}/modules.d/98selinux
- %{dracutlibdir}/modules.d/98syslog
- %{dracutlibdir}/modules.d/98systemd
- %{dracutlibdir}/modules.d/98usrmount
diff --git a/0058-url-lib-url-lib.sh-turn-off-curl-globbing.patch b/0058-url-lib-url-lib.sh-turn-off-curl-globbing.patch
deleted file mode 100644
index 7e0fd22..0000000
--- a/0058-url-lib-url-lib.sh-turn-off-curl-globbing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1b8616adeec0e397f8485496d80b70c4368a9c4b Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 16:15:24 +0200
-Subject: [PATCH] url-lib/url-lib.sh: turn off curl globbing
-
-https://bugzilla.redhat.com/show_bug.cgi?id=907497
----
- modules.d/45url-lib/url-lib.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
-index 4a3d56d..c00ca18 100755
---- a/modules.d/45url-lib/url-lib.sh
-+++ b/modules.d/45url-lib/url-lib.sh
-@@ -54,7 +54,7 @@ add_url_handler() {
-
- export CURL_HOME="/run/initramfs/url-lib"
- mkdir -p $CURL_HOME
--curl_args="--location --retry 3 --fail --show-error"
-+curl_args="--globoff --location --retry 3 --fail --show-error"
- getargbool 0 rd.noverifyssl && curl_args="$curl_args --insecure"
-
- proxy=$(getarg proxy=)
-@@ -64,7 +64,7 @@ curl_fetch_url() {
- local url="$1" outloc="$2"
- echo "$url" > /proc/self/fd/0
- if [ -n "$outloc" ]; then
-- curl --globoff $curl_args --output "$outloc" "$url" || return $?
-+ curl $curl_args --output "$outloc" "$url" || return $?
- else
- local outdir="$(mkuniqdir /tmp curl_fetch_url)"
- ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
diff --git a/0059-btrfs-include-btrfs-zero-log-in-the-initramfs.patch b/0059-btrfs-include-btrfs-zero-log-in-the-initramfs.patch
deleted file mode 100644
index f292928..0000000
--- a/0059-btrfs-include-btrfs-zero-log-in-the-initramfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c6df70fb4859fba630433586d39d728e60613399 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 16:34:34 +0200
-Subject: [PATCH] btrfs: include btrfs-zero-log in the initramfs
-
-https://bugzilla.redhat.com/show_bug.cgi?id=963257
----
- modules.d/90btrfs/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
-index 4a7c01d..e1c8577 100755
---- a/modules.d/90btrfs/module-setup.sh
-+++ b/modules.d/90btrfs/module-setup.sh
-@@ -43,7 +43,7 @@ install() {
- /usr/lib/dracut/hooks/initqueue/timeout/btrfs_timeout.sh
- fi
-
-- dracut_install btrfsck
-+ dracut_install -o btrfsck btrfs-zero-log
- inst $(command -v btrfs) /sbin/btrfs
- }
-
diff --git a/0060-ifcfg-write-ifcfg.sh-proper-NAME-the-interfaces.patch b/0060-ifcfg-write-ifcfg.sh-proper-NAME-the-interfaces.patch
deleted file mode 100644
index b291a27..0000000
--- a/0060-ifcfg-write-ifcfg.sh-proper-NAME-the-interfaces.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 284d62da816a9d3678906e9dbeb796132016b9c9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 May 2013 16:56:40 +0200
-Subject: [PATCH] ifcfg/write-ifcfg.sh: proper NAME the interfaces
-
-https://bugzilla.redhat.com/show_bug.cgi?id=965842
----
- modules.d/45ifcfg/write-ifcfg.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
-index 16da5e4..baa63fa 100755
---- a/modules.d/45ifcfg/write-ifcfg.sh
-+++ b/modules.d/45ifcfg/write-ifcfg.sh
-@@ -152,7 +152,7 @@ for netif in $IFACES ; do
- fi
- print_s390 $netif
- echo "TYPE=Ethernet"
-- echo "NAME=\"Boot Disk\""
-+ echo "NAME=\"$netif\""
- [ -n "$mtu" ] && echo "MTU=$mtu"
- } >> /tmp/ifcfg/ifcfg-$netif
- fi
-@@ -162,7 +162,7 @@ for netif in $IFACES ; do
- {
- # This variable is an indicator of a bond interface for initscripts
- echo "BONDING_OPTS=\"$bondoptions\""
-- echo "NAME=\"Boot Disk\""
-+ echo "NAME=\"$netif\""
- } >> /tmp/ifcfg/ifcfg-$netif
-
- for slave in $bondslaves ; do
-@@ -186,7 +186,7 @@ for netif in $IFACES ; do
- # bridge
- {
- echo "TYPE=Bridge"
-- echo "NAME=\"Boot Disk\""
-+ echo "NAME=\"$netif\""
- } >> /tmp/ifcfg/ifcfg-$netif
- if [ "$ethname" = "$bondname" ] ; then
- {
diff --git a/0061-40network-Provide-a-hostname-fallback-function-in-ca.patch b/0061-40network-Provide-a-hostname-fallback-function-in-ca.patch
deleted file mode 100644
index e682aa2..0000000
--- a/0061-40network-Provide-a-hostname-fallback-function-in-ca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cbfe65c2fe599b7b5eb6a144332e84c2290869ea Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Fri, 17 May 2013 13:54:57 +0200
-Subject: [PATCH] [40network] Provide a hostname fallback function, in case
- there is no executable of this name
-
----
- modules.d/40network/net-lib.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index f9b461b..d62d5ad 100644
---- a/modules.d/40network/net-lib.sh
-+++ b/modules.d/40network/net-lib.sh
-@@ -366,3 +366,7 @@ linkup() {
- && wait_for_if_up $1 2>/dev/null
- }
-
-+type hostname >/dev/null 2>&1 || \
-+hostname() {
-+ cat /proc/sys/kernel/hostname
-+}
diff --git a/0062-dracut-emergency.service-do-not-start-for-action_on_.patch b/0062-dracut-emergency.service-do-not-start-for-action_on_.patch
deleted file mode 100644
index f325a02..0000000
--- a/0062-dracut-emergency.service-do-not-start-for-action_on_.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b78e6ac2c328c76057b17059a761ab44707f9aa0 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 11:33:25 +0200
-Subject: [PATCH] dracut-emergency.service: do not start for
- "action_on_fail=continue"
-
----
- modules.d/98systemd/dracut-emergency.service | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/98systemd/dracut-emergency.service b/modules.d/98systemd/dracut-emergency.service
-index 12eef6c..ebf5aac 100644
---- a/modules.d/98systemd/dracut-emergency.service
-+++ b/modules.d/98systemd/dracut-emergency.service
-@@ -13,6 +13,7 @@ DefaultDependencies=no
- After=systemd-vconsole-setup.service
- Wants=systemd-vconsole-setup.service
- Conflicts=emergency.service emergency.target
-+ConditionKernelCommandLine=!action_on_fail=continue
-
- [Service]
- Environment=HOME=/
diff --git a/0063-i18n-module-setup.sh-install-default-font-latarcyrhe.patch b/0063-i18n-module-setup.sh-install-default-font-latarcyrhe.patch
deleted file mode 100644
index 1dce9a1..0000000
--- a/0063-i18n-module-setup.sh-install-default-font-latarcyrhe.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0a3e348225336f45a9abe8e74b384fdf17e9053f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 13:20:00 +0200
-Subject: [PATCH] i18n/module-setup.sh: install default font latarcyrheb-sun16
-
----
- modules.d/10i18n/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
-index fcd8282..60a50e7 100755
---- a/modules.d/10i18n/module-setup.sh
-+++ b/modules.d/10i18n/module-setup.sh
-@@ -14,7 +14,7 @@ depends() {
- install() {
- dracut_install -o $systemdutildir/systemd-vconsole-setup
- KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
-- DEFAULT_FONT=LatArCyrHeb-16
-+ DEFAULT_FONT=latarcyrheb-sun16
- I18N_CONF="/etc/locale.conf"
- VCONFIG_CONF="/etc/vconsole.conf"
-
diff --git a/0064-crypt-loop-module-setup.sh-install-loop-kernel-modul.patch b/0064-crypt-loop-module-setup.sh-install-loop-kernel-modul.patch
deleted file mode 100644
index 04c2fc6..0000000
--- a/0064-crypt-loop-module-setup.sh-install-loop-kernel-modul.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8099e7b1ba10eaf7780e6423e97a13a5c62cf5bd Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 13:31:54 +0200
-Subject: [PATCH] crypt-loop/module-setup.sh: install loop kernel module
-
----
- modules.d/91crypt-loop/module-setup.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules.d/91crypt-loop/module-setup.sh b/modules.d/91crypt-loop/module-setup.sh
-index 5e7bcbd..218d27a 100644
---- a/modules.d/91crypt-loop/module-setup.sh
-+++ b/modules.d/91crypt-loop/module-setup.sh
-@@ -8,6 +8,10 @@ depends() {
- echo crypt
- }
-
-+installkernel() {
-+ instmods loop
-+}
-+
- install() {
- dracut_install losetup
- inst "$moddir/crypt-loop-lib.sh" "/lib/dracut-crypt-loop-lib.sh"
diff --git a/0065-udev-rules-module-setup.sh-optionally-install-etc-pc.patch b/0065-udev-rules-module-setup.sh-optionally-install-etc-pc.patch
deleted file mode 100644
index 5e01a5d..0000000
--- a/0065-udev-rules-module-setup.sh-optionally-install-etc-pc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From af2578562c4a32445c6a9dd91651b9ad89043f0d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 14:28:25 +0200
-Subject: [PATCH] udev-rules/module-setup.sh: optionally install
- /etc/pcmcia/config.opts
-
-https://bugzilla.redhat.com/show_bug.cgi?id=920076
----
- modules.d/95udev-rules/module-setup.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index 1c48202..e952e80 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -69,6 +69,8 @@ install() {
- ${udevdir}/pcmcia-socket-startup \
- ${udevdir}/pcmcia-check-broken-cis
-
-+ dracut_install -o /etc/pcmcia/config.opts
-+
- [ -f /etc/arch-release ] && \
- inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh
-
diff --git a/0066-ifcfg-write-ifcfg.sh.patch b/0066-ifcfg-write-ifcfg.sh.patch
deleted file mode 100644
index fe21150..0000000
--- a/0066-ifcfg-write-ifcfg.sh.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 6625c085aeee0694f4f53b0454ff3466755d90a8 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 14:38:52 +0200
-Subject: [PATCH] ifcfg/write-ifcfg.sh:
-
-- fix ONBOOT for slaves
-- set TYPE=Bond for bonding
-
-https://bugzilla.redhat.com/show_bug.cgi?id=919001
----
- modules.d/45ifcfg/write-ifcfg.sh | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
-index baa63fa..625d00b 100755
---- a/modules.d/45ifcfg/write-ifcfg.sh
-+++ b/modules.d/45ifcfg/write-ifcfg.sh
-@@ -163,16 +163,16 @@ for netif in $IFACES ; do
- # This variable is an indicator of a bond interface for initscripts
- echo "BONDING_OPTS=\"$bondoptions\""
- echo "NAME=\"$netif\""
-+ echo "TYPE=Bond"
- } >> /tmp/ifcfg/ifcfg-$netif
-
- for slave in $bondslaves ; do
-- # Set ONBOOT=no to prevent initscripts from trying to setup already bonded physical interface
- # write separate ifcfg file for the raw eth interface
- {
- echo "# Generated by dracut initrd"
- echo "DEVICE=$slave"
- echo "TYPE=Ethernet"
-- echo "ONBOOT=no"
-+ echo "ONBOOT=yes"
- echo "NETBOOT=yes"
- echo "HWADDR=$(cat /sys/class/net/$slave/address)"
- echo "SLAVE=yes"
-@@ -190,10 +190,9 @@ for netif in $IFACES ; do
- } >> /tmp/ifcfg/ifcfg-$netif
- if [ "$ethname" = "$bondname" ] ; then
- {
-- # Set ONBOOT=no to prevent initscripts from trying to setup already bridged bond interface
- echo "# Generated by dracut initrd"
- echo "DEVICE=$bondname"
-- echo "ONBOOT=no"
-+ echo "ONBOOT=yes"
- echo "NETBOOT=yes"
- # This variable is an indicator of a bond interface for initscripts
- echo "BONDING_OPTS=\"$bondoptions\""
-@@ -202,12 +201,11 @@ for netif in $IFACES ; do
- } >> /tmp/ifcfg/ifcfg-$bondname
- for slave in $bondslaves ; do
- # write separate ifcfg file for the raw eth interface
-- # Set ONBOOT=no to prevent initscripts from trying to setup already bridged physical interface
- {
- echo "# Generated by dracut initrd"
- echo "DEVICE=$slave"
- echo "TYPE=Ethernet"
-- echo "ONBOOT=no"
-+ echo "ONBOOT=yes"
- echo "NETBOOT=yes"
- echo "HWADDR=$(cat /sys/class/net/$slave/address)"
- echo "SLAVE=yes"
-@@ -221,7 +219,7 @@ for netif in $IFACES ; do
- echo "# Generated by dracut initrd"
- echo "DEVICE=$ethname"
- echo "TYPE=Ethernet"
-- echo "ONBOOT=no"
-+ echo "ONBOOT=yes"
- echo "NETBOOT=yes"
- echo "HWADDR=$(cat /sys/class/net/$ethname/address)"
- echo "BRIDGE=$netif"
diff --git a/0067-kernel-modules-module-setup.sh-add-nvme-kernel-modul.patch b/0067-kernel-modules-module-setup.sh-add-nvme-kernel-modul.patch
deleted file mode 100644
index 1349935..0000000
--- a/0067-kernel-modules-module-setup.sh-add-nvme-kernel-modul.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From af2716626aa0243457c0e00fdd457f97269a50b3 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 14:45:59 +0200
-Subject: [PATCH] kernel-modules/module-setup.sh: add nvme kernel module
-
-apparently not caught by the block driver regexp
-
-https://bugzilla.redhat.com/show_bug.cgi?id=910734
----
- modules.d/90kernel-modules/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
-index a04eba8..4060c80 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -42,7 +42,7 @@ installkernel() {
- instmods yenta_socket scsi_dh_rdac scsi_dh_emc \
- atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
- hid-logitech-dj hid-microsoft firewire-ohci \
-- pcmcia usb_storage
-+ pcmcia usb_storage nvme
-
- if [[ "$(uname -p)" == arm* ]]; then
- # arm specific modules
diff --git a/0068-fs-lib-module-setup.sh-add-xfs_metadump.patch b/0068-fs-lib-module-setup.sh-add-xfs_metadump.patch
deleted file mode 100644
index 5f3d23b..0000000
--- a/0068-fs-lib-module-setup.sh-add-xfs_metadump.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4f084f3ab50e8cac8ab9cc889a96cce864bd98c8 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 May 2013 17:51:57 +0200
-Subject: [PATCH] fs-lib/module-setup.sh: add xfs_metadump
-
----
- modules.d/99fs-lib/module-setup.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/99fs-lib/module-setup.sh b/modules.d/99fs-lib/module-setup.sh
-index 637737e..df9a04c 100755
---- a/modules.d/99fs-lib/module-setup.sh
-+++ b/modules.d/99fs-lib/module-setup.sh
-@@ -15,7 +15,7 @@ echo_fs_helper() {
- local dev=$1 fs=$2
- case "$fs" in
- xfs)
-- echo -n " xfs_db xfs_repair xfs_check "
-+ echo -n " xfs_db xfs_repair xfs_check xfs_metadump "
- ;;
- ext?)
- echo -n " e2fsck "
-@@ -65,7 +65,7 @@ install() {
- if [[ "$fscks" = "${fscks#*[^ ]*}" ]]; then
- _helpers="\
- umount mount /sbin/fsck*
-- xfs_db xfs_check xfs_repair
-+ xfs_db xfs_check xfs_repair xfs_metadump
- e2fsck jfs_fsck reiserfsck btrfsck
- "
- if [[ $hostonly ]]; then
diff --git a/0069-99fs-lib-fs-lib.sh-Let-user-specify-the-action-after.patch b/0069-99fs-lib-fs-lib.sh-Let-user-specify-the-action-after.patch
deleted file mode 100644
index 5055db7..0000000
--- a/0069-99fs-lib-fs-lib.sh-Let-user-specify-the-action-after.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 679fa7ed3c0f4c827bfc6885d34f56713fe85c1e Mon Sep 17 00:00:00 2001
-From: Baoquan He <bhe@redhat.com>
-Date: Wed, 29 May 2013 14:33:06 +0800
-Subject: [PATCH] 99fs-lib/fs-lib.sh: Let user specify the action after fail
- for fsck
-
-The fsck is ignored when replace emergency_shell with action_on_fail,
-now add it.
-
-Signed-off-by: Baoquan He <bhe@redhat.com>
----
- modules.d/99fs-lib/fs-lib.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index e1f3074..88e7348 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -7,14 +7,14 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
- fsck_ask_reboot() {
- info "note - fsck suggests reboot, if you"
- info "leave shell, booting will continue normally"
-- emergency_shell -n "(reboot ?)"
-+ action_on_fail -n "(reboot ?)"
- }
-
- fsck_ask_err() {
- warn "*** An error occurred during the file system check."
- warn "*** Dropping you to a shell; the system will try"
- warn "*** to mount the filesystem(s), when you leave the shell."
-- emergency_shell -n "(Repair filesystem)"
-+ action_on_fail -n "(Repair filesystem)"
- }
-
- # inherits: _ret _drv _out
diff --git a/0070-use-system-provides-udev-rule-and-initialization-scr.patch b/0070-use-system-provides-udev-rule-and-initialization-scr.patch
deleted file mode 100644
index b3b8910..0000000
--- a/0070-use-system-provides-udev-rule-and-initialization-scr.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From bc97e005fa097b9b8111ab0ec19bd4e246c13f9b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Wed, 29 May 2013 11:26:56 +0200
-Subject: [PATCH] use system provides udev rule and initialization script
-
----
- modules.d/95zfcp/56-zfcp.rules | 1 -
- modules.d/95zfcp/zfcpconf.sh | 57 ------------------------------------------
- 2 files changed, 58 deletions(-)
- delete mode 100644 modules.d/95zfcp/56-zfcp.rules
- delete mode 100755 modules.d/95zfcp/zfcpconf.sh
-
-diff --git a/modules.d/95zfcp/56-zfcp.rules b/modules.d/95zfcp/56-zfcp.rules
-deleted file mode 100644
-index 5558f8b..0000000
---- a/modules.d/95zfcp/56-zfcp.rules
-+++ /dev/null
-@@ -1 +0,0 @@
--KERNEL=="zfcp", RUN+="/sbin/zfcpconf.sh"
-diff --git a/modules.d/95zfcp/zfcpconf.sh b/modules.d/95zfcp/zfcpconf.sh
-deleted file mode 100755
-index 7127eae..0000000
---- a/modules.d/95zfcp/zfcpconf.sh
-+++ /dev/null
-@@ -1,57 +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
--
--# config file syntax:
--# deviceno WWPN FCPLUN
--#
--# Example:
--# 0.0.4000 0x5005076300C213e9 0x5022000000000000
--# 0.0.4001 0x5005076300c213e9 0x5023000000000000
--#
--#
--# manual setup:
--# modprobe zfcp
--# echo 1 > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
--# echo LUN > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
--#
--# Example:
--# modprobe zfcp
--# echo 1 > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
--# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
--
--CONFIG=/etc/zfcp.conf
--PATH=/usr/sbin:/usr/bin:/sbin:/bin
--
--if [ -f "$CONFIG" ]; then
-- if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
-- modprobe zfcp
-- fi
-- if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
-- return
-- fi
-- sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' < $CONFIG| while read line; do
-- case $line in
-- \#*) ;;
-- *)
-- [ -z "$line" ] && continue
-- set $line
-- if [ $# -eq 5 ]; then
-- DEVICE=$1
-- SCSIID=$2
-- WWPN=$3
-- SCSILUN=$4
-- FCPLUN=$5
-- echo "Warning: Deprecated values in /etc/zfcp.conf, ignoring SCSI ID $SCSIID and SCSI LUN $SCSILUN"
-- elif [ $# -eq 3 ]; then
-- DEVICE=${1##*0x}
-- WWPN=$2
-- FCPLUN=$3
-- fi
-- echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
-- [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/${FCPLUN} ] \
-- && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/unit_add
-- ;;
-- esac
-- done
--fi
diff --git a/0071-selinux-load_policy-script-fix.patch b/0071-selinux-load_policy-script-fix.patch
deleted file mode 100644
index b6e050f..0000000
--- a/0071-selinux-load_policy-script-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cf8b1b785366e0a7c2ae1b3781d66b0f99d6f8fe Mon Sep 17 00:00:00 2001
-From: "dyoung@redhat.com" <dyoung@redhat.com>
-Date: Thu, 30 May 2013 14:19:00 +0800
-Subject: [PATCH] selinux: load_policy script fix
-
-chroot load_policy will use selinuxfs which should be mounted
-in $NEWROOT/sys/fs/selinux for Fedora 19, but because there's
-no $NEWROOT/sys/fs, so later process will fail.
-
-Fixing this by bind mount /sys to $NEWROOT/sys.
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
----
- modules.d/98selinux/selinux-loadpolicy.sh | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/98selinux/selinux-loadpolicy.sh b/modules.d/98selinux/selinux-loadpolicy.sh
-index 7526265..5dddfc2 100755
---- a/modules.d/98selinux/selinux-loadpolicy.sh
-+++ b/modules.d/98selinux/selinux-loadpolicy.sh
-@@ -24,7 +24,8 @@ rd_load_policy()
- local ret=0
- local out
- info "Loading SELinux policy"
-- # load_policy does mount /proc and /selinux in
-+ mount -o bind /sys $NEWROOT/sys
-+ # load_policy does mount /proc and /sys/fs/selinux in
- # libselinux,selinux_init_load_policy()
- if [ -x "$NEWROOT/sbin/load_policy" ]; then
- out=$(LANG=C chroot "$NEWROOT" /sbin/load_policy -i 2>&1)
-@@ -35,6 +36,8 @@ rd_load_policy()
- ret=$?
- info $out
- fi
-+ umount $NEWROOT/sys/fs/selinux
-+ umount $NEWROOT/sys
-
- if [ "$SELINUX" = "disabled" ]; then
- return 0;
diff --git a/0072-base-dracut-lib.sh-export-DRACUT_SYSTEMD-and-NEWROOT.patch b/0072-base-dracut-lib.sh-export-DRACUT_SYSTEMD-and-NEWROOT.patch
deleted file mode 100644
index b0fe958..0000000
--- a/0072-base-dracut-lib.sh-export-DRACUT_SYSTEMD-and-NEWROOT.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 62cb52f4317460f313c18c906737d9e0eddb9081 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 08:32:18 +0200
-Subject: [PATCH] base/dracut-lib.sh: export DRACUT_SYSTEMD and NEWROOT
-
----
- modules.d/99base/dracut-lib.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 5cb0add..d20ce67 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -2,6 +2,9 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
-
-+export DRACUT_SYSTEMD
-+export NEWROOT
-+
- debug_off() {
- set +x
- }
diff --git a/0073-kernel-modules-module-setup.sh-add-hid-hyperv-and-hv.patch b/0073-kernel-modules-module-setup.sh-add-hid-hyperv-and-hv.patch
deleted file mode 100644
index b25c770..0000000
--- a/0073-kernel-modules-module-setup.sh-add-hid-hyperv-and-hv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e64bcf5a9937bb53260af79bc4c93f9eab502d1a Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 08:38:40 +0200
-Subject: [PATCH] kernel-modules/module-setup.sh: add hid-hyperv and hv-vmbus
-
----
- modules.d/90kernel-modules/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
-index 4060c80..ed7a19e 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -42,7 +42,7 @@ installkernel() {
- instmods yenta_socket scsi_dh_rdac scsi_dh_emc \
- atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
- hid-logitech-dj hid-microsoft firewire-ohci \
-- pcmcia usb_storage nvme
-+ pcmcia usb_storage nvme hid-hyperv hv-vmbus
-
- if [[ "$(uname -p)" == arm* ]]; then
- # arm specific modules
diff --git a/0074-dmsquash-live-dmsquash-live-root.sh-add-parameter-rd.patch b/0074-dmsquash-live-dmsquash-live-root.sh-add-parameter-rd.patch
deleted file mode 100644
index 170eb90..0000000
--- a/0074-dmsquash-live-dmsquash-live-root.sh-add-parameter-rd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 32214acb3ae02d28cf72e15040f062fcbd5aa4ab Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 09:26:43 +0200
-Subject: [PATCH] dmsquash-live/dmsquash-live-root.sh: add parameter
- rd.live.squashimg
-
-rd.live.squashimg names the squash image in the rd.live.dir
-and defaults to squashfs.img
-
-https://bugzilla.redhat.com/show_bug.cgi?id=789036
-https://bugzilla.redhat.com/show_bug.cgi?id=782108
----
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index 07e41f0..f63819c 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -19,6 +19,9 @@ livedev="$1"
- # specified as their own things
- live_dir=$(getarg rd.live.dir -d live_dir)
- [ -z "$live_dir" ] && live_dir="LiveOS"
-+squash_image=$(getarg rd.live.squashimg)
-+[ -z "squash_image" ] && squash_image="squashfs.img"
-+
- getargbool 0 rd.live.ram -d -y live_ram && live_ram="yes"
- getargbool 0 rd.live.overlay.reset -d -y reset_overlay && reset_overlay="yes"
- getargbool 0 rd.live.overlay.readonly -d -y readonly_overlay && readonly_overlay="--readonly" || readonly_overlay=""
-@@ -180,8 +183,8 @@ if [ -n "$FSIMG" ] ; then
- fi
-
- # we might have an embedded fs image on squashfs (compressed live)
--if [ -e /run/initramfs/live/${live_dir}/squashfs.img ]; then
-- SQUASHED="/run/initramfs/live/${live_dir}/squashfs.img"
-+if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
-+ SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
- fi
-
- if [ -e "$SQUASHED" ] ; then
diff --git a/0075-systemd-emergency.service-do-not-run-for-action_on_f.patch b/0075-systemd-emergency.service-do-not-run-for-action_on_f.patch
deleted file mode 100644
index ff160f8..0000000
--- a/0075-systemd-emergency.service-do-not-run-for-action_on_f.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From dcae873414ff643e1de790f256e414923e2aef8b Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 11:14:39 +0200
-Subject: [PATCH] systemd/emergency.service: do not run for
- action_on_fail=continue
-
-same as for dracut-emergency.service
----
- modules.d/98systemd/emergency.service | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/98systemd/emergency.service b/modules.d/98systemd/emergency.service
-index 35d9c31..c19fe37 100644
---- a/modules.d/98systemd/emergency.service
-+++ b/modules.d/98systemd/emergency.service
-@@ -12,6 +12,7 @@ Description=Emergency Shell
- DefaultDependencies=no
- After=systemd-vconsole-setup.service
- Wants=systemd-vconsole-setup.service
-+ConditionKernelCommandLine=!action_on_fail=continue
-
- [Service]
- Environment=HOME=/
diff --git a/0076-network-wait-for-all-required-interfaces-if-rd.needn.patch b/0076-network-wait-for-all-required-interfaces-if-rd.needn.patch
deleted file mode 100644
index e38bf57..0000000
--- a/0076-network-wait-for-all-required-interfaces-if-rd.needn.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From feaf30ffaa3365febe06ef3f0086778a6d364f0c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 11:38:23 +0200
-Subject: [PATCH] network: wait for all required interfaces if "rd.neednet=1"
-
-also set bootdev to the first configured interface, if missing
-
-https://bugzilla.redhat.com/show_bug.cgi?id=801829
----
- modules.d/40network/net-genrules.sh | 8 +++++---
- modules.d/40network/parse-ip-opts.sh | 9 ++++++---
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
-index 8bf6a89..8f28c93 100755
---- a/modules.d/40network/net-genrules.sh
-+++ b/modules.d/40network/net-genrules.sh
-@@ -14,8 +14,10 @@ fix_bootif() {
- echo $macaddr | sed 'y/ABCDEF/abcdef/'
- }
-
-+getargbool 0 rd.neednet && NEEDNET=1
-+
- # Don't continue if we don't need network
--if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && ! getargbool 0 rd.neednet >/dev/null; then
-+if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && [ "$NEEDNET" != "1" ]; then
- return
- fi
-
-@@ -73,13 +75,13 @@ fi
- elif [ -n "$IFACES" ] ; then
- for iface in $IFACES ; do
- printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="%s"\n' "$iface" "/sbin/initqueue --onetime $ifup"
-- if [ "$bootdev" = "$iface" ]; then
-+ if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
- echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
- fi
- done
-
- for iface in $MASTER_IFACES; do
-- if [ "$bootdev" = "$iface" ]; then
-+ if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
- echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
- fi
- done
-diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
-index c7dc3ce..f64c936 100755
---- a/modules.d/40network/parse-ip-opts.sh
-+++ b/modules.d/40network/parse-ip-opts.sh
-@@ -54,6 +54,12 @@ fi
- for p in $(getargs ip=); do
- ip_to_var $p
-
-+ # make first device specified the BOOTDEV
-+ if [ -z "$BOOTDEV" ] && [ -n "$dev" ]; then
-+ BOOTDEV="$dev"
-+ [ -n "$NEEDBOOTDEV" ] && warn "Setting bootdev to '$BOOTDEV'"
-+ fi
-+
- # skip ibft since we did it above
- [ "$autoconf" = "ibft" ] && continue
-
-@@ -121,6 +127,3 @@ fi
- # Store BOOTDEV and IFACES for later use
- [ -n "$BOOTDEV" ] && echo $BOOTDEV > /tmp/net.bootdev
- [ -n "$IFACES" ] && echo $IFACES > /tmp/net.ifaces
--
--# We need a ip= line for the configured bootdev=
--[ -n "$NEEDBOOTDEV" ] && [ -z "$BOOTDEVOK" ] && die "Bootdev Argument '$BOOTDEV' not found"
diff --git a/0077-lvm-add-tools-for-thin-provisioning.patch b/0077-lvm-add-tools-for-thin-provisioning.patch
deleted file mode 100644
index d99d5eb..0000000
--- a/0077-lvm-add-tools-for-thin-provisioning.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 57937cf480c8e612edae5b00d978dce84fd83be9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 12:02:59 +0200
-Subject: [PATCH] lvm: add tools for thin provisioning
-
-https://bugzilla.redhat.com/show_bug.cgi?id=921235
----
- modules.d/90lvm/module-setup.sh | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index 22186f4..e8416ca 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -3,7 +3,6 @@
- # ex: ts=8 sw=4 sts=4 et filetype=sh
-
- check() {
-- local _rootdev _activated
- # No point trying to support lvm if the binaries are missing
- type -P lvm >/dev/null || return 1
-
-@@ -25,6 +24,8 @@ depends() {
-
- install() {
- local _i
-+ local _needthin
-+ local _activated
- inst lvm
-
- check_lvm() {
-@@ -39,6 +40,10 @@ install() {
- fi
- push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
- fi
-+ if ! [[ $_needthin ]]; then
-+ [[ $(lvs --noheadings -o segtype $1) == *thin* ]] && _needthin=1
-+ fi
-+
- return 0
- }
-
-@@ -65,5 +70,10 @@ install() {
- inst_hook cmdline 30 "$moddir/parse-lvm.sh"
-
- inst_libdir_file "libdevmapper-event-lvm*.so"
-+
-+ if [[ $_needthin ]]; then
-+ dracut_install -o thin_dump thin_restore thin_check
-+ fi
-+
- }
-
diff --git a/0078-ifcfg-write-ifcfg.sh-fixed-logic.patch b/0078-ifcfg-write-ifcfg.sh-fixed-logic.patch
deleted file mode 100644
index 4878255..0000000
--- a/0078-ifcfg-write-ifcfg.sh-fixed-logic.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From caf207afa7c2a65f25be26a735643a873f5c092f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 30 May 2013 14:37:41 +0200
-Subject: [PATCH] ifcfg/write-ifcfg.sh: fixed logic
-
-seems like nobody tested this with recent dracut versions.
----
- modules.d/45ifcfg/write-ifcfg.sh | 75 ++++++++++++++++++++++------------------
- 1 file changed, 41 insertions(+), 34 deletions(-)
-
-diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
-index 625d00b..2e78c49 100755
---- a/modules.d/45ifcfg/write-ifcfg.sh
-+++ b/modules.d/45ifcfg/write-ifcfg.sh
-@@ -4,10 +4,6 @@
-
- # NFS root might have reached here before /tmp/net.ifaces was written
- udevadm settle --timeout=30
--# Don't write anything if we don't know our bootdev
--[ -f /tmp/net.ifaces ] || return 1
--
--read IFACES < /tmp/net.ifaces
-
- if [ -e /tmp/bridge.info ]; then
- . /tmp/bridge.info
-@@ -79,15 +75,25 @@ print_s390() {
- echo "OPTIONS=\"${OPTIONS}\""
- }
-
-+for netup in /tmp/net.*.did-setup ; do
-+ [ -f $netup ] || continue
-
--for netif in $IFACES ; do
-+ netif=${netup%%.did-setup}
-+ netif=${netif##*/net.}
- [ -e /tmp/ifcfg/ifcfg-$netif ] && continue
-- # bridge?
- unset bridge
- unset bond
- unset bondslaves
- unset bondname
- unset bondoptions
-+ unset uuid
-+ unset ip
-+ unset gw
-+ unset mtu
-+ unset mask
-+ unset macaddr
-+ unset slave
-+ unset ethname
- [ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info
-
- uuid=$(cat /proc/sys/kernel/random/uuid)
-@@ -100,45 +106,46 @@ for netif in $IFACES ; do
- cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
- {
- echo "# Generated by dracut initrd"
-- echo "DEVICE=$netif"
-+ echo "DEVICE=\"$netif\""
- echo "ONBOOT=yes"
- echo "NETBOOT=yes"
-- echo "UUID=$uuid"
-- [ -n "$mtu" ] && echo "MTU=$mtu"
-- if [ -f /tmp/net.$netif.lease ]; then
-+ echo "UUID=\"$uuid\""
-+ if [ -f /tmp/dhclient.$netif.lease ]; then
-+ [ -f /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
- strstr "$ip" '*:*:*' && echo "IPV6INIT=yes"
- if [ -f /tmp/net.$netif.has_ibft_config ]; then
- echo "BOOTPROTO=ibft"
- else
- echo "BOOTPROTO=dhcp"
- fi
-- cp /tmp/net.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease
-+ cp /tmp/dhclient.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease
- else
- # If we've booted with static ip= lines, the override file is there
- [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
- if strstr "$ip" '*:*:*'; then
- echo "IPV6INIT=yes"
- echo "IPV6_AUTOCONF=no"
-- echo "IPV6ADDR=$ip/$mask"
-+ echo "IPV6ADDR=\"$ip/$mask\""
- else
- if [ -f /tmp/net.$netif.has_ibft_config ]; then
- echo "BOOTPROTO=ibft"
- else
- echo "BOOTPROTO=none"
-- echo "IPADDR=$ip"
-+ echo "IPADDR=\"$ip\""
- if strstr "$mask" "."; then
-- echo "NETMASK=$mask"
-+ echo "NETMASK=\"$mask\""
- else
-- echo "PREFIX=$mask"
-+ echo "PREFIX=\"$mask\""
- fi
- fi
- fi
- if strstr "$gw" '*:*:*'; then
-- echo "IPV6_DEFAULTGW=$gw"
-+ echo "IPV6_DEFAULTGW=\"$gw\""
- elif [ -n "$gw" ]; then
-- echo "GATEWAY=$gw"
-+ echo "GATEWAY=\"$gw\""
- fi
- fi
-+ [ -n "$mtu" ] && echo "MTU=\"$mtu\""
- } > /tmp/ifcfg/ifcfg-$netif
-
- # bridge needs different things written to ifcfg
-@@ -146,14 +153,14 @@ for netif in $IFACES ; do
- # standard interface
- {
- if [ -n "$macaddr" ]; then
-- echo "MACADDR=$macaddr"
-+ echo "MACADDR=\"$macaddr\""
- else
- echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\""
- fi
- print_s390 $netif
- echo "TYPE=Ethernet"
- echo "NAME=\"$netif\""
-- [ -n "$mtu" ] && echo "MTU=$mtu"
-+ [ -n "$mtu" ] && echo "MTU=\"$mtu\""
- } >> /tmp/ifcfg/ifcfg-$netif
- fi
-
-@@ -170,14 +177,14 @@ for netif in $IFACES ; do
- # write separate ifcfg file for the raw eth interface
- {
- echo "# Generated by dracut initrd"
-- echo "DEVICE=$slave"
-+ echo "DEVICE=\"$slave\""
- echo "TYPE=Ethernet"
- echo "ONBOOT=yes"
- echo "NETBOOT=yes"
-- echo "HWADDR=$(cat /sys/class/net/$slave/address)"
-+ echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\""
- echo "SLAVE=yes"
-- echo "MASTER=$netif"
-- echo "NAME=$slave"
-+ echo "MASTER=\"$netif\""
-+ echo "NAME=\"$slave\""
- } >> /tmp/ifcfg/ifcfg-$slave
- done
- fi
-@@ -191,45 +198,45 @@ for netif in $IFACES ; do
- if [ "$ethname" = "$bondname" ] ; then
- {
- echo "# Generated by dracut initrd"
-- echo "DEVICE=$bondname"
-+ echo "DEVICE=\"$bondname\""
- echo "ONBOOT=yes"
- echo "NETBOOT=yes"
- # This variable is an indicator of a bond interface for initscripts
- echo "BONDING_OPTS=\"$bondoptions\""
-- echo "BRIDGE=$netif"
-+ echo "BRIDGE=\"$netif\""
- echo "NAME=\"$bondname\""
- } >> /tmp/ifcfg/ifcfg-$bondname
- for slave in $bondslaves ; do
- # write separate ifcfg file for the raw eth interface
- {
- echo "# Generated by dracut initrd"
-- echo "DEVICE=$slave"
-+ echo "DEVICE=\"$slave\""
- echo "TYPE=Ethernet"
- echo "ONBOOT=yes"
- echo "NETBOOT=yes"
-- echo "HWADDR=$(cat /sys/class/net/$slave/address)"
-+ echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\""
- echo "SLAVE=yes"
-- echo "MASTER=$bondname"
-- echo "NAME=$slave"
-+ echo "MASTER=\"$bondname\""
-+ echo "NAME=\"$slave\""
- } >> /tmp/ifcfg/ifcfg-$slave
- done
- else
- # write separate ifcfg file for the raw eth interface
- {
- echo "# Generated by dracut initrd"
-- echo "DEVICE=$ethname"
-+ echo "DEVICE=\"$ethname\""
- echo "TYPE=Ethernet"
- echo "ONBOOT=yes"
- echo "NETBOOT=yes"
-- echo "HWADDR=$(cat /sys/class/net/$ethname/address)"
-- echo "BRIDGE=$netif"
-- echo "NAME=$ethname"
-+ echo "HWADDR=\"$(cat /sys/class/net/$ethname/address)\""
-+ echo "BRIDGE=\"$netif\""
-+ echo "NAME=\"$ethname\""
- } >> /tmp/ifcfg/ifcfg-$ethname
- fi
- fi
- i=1
- for ns in $(getargs nameserver); do
-- echo "DNS${i}=${ns}" >> /tmp/ifcfg/ifcfg-$netif
-+ echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-$netif
- i=$((i+1))
- done
- done
diff --git a/0079-dracut-functions.sh-get_persistent_dev-fix-case-for-.patch b/0079-dracut-functions.sh-get_persistent_dev-fix-case-for-.patch
deleted file mode 100644
index d35ba94..0000000
--- a/0079-dracut-functions.sh-get_persistent_dev-fix-case-for-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15c5c072f4fe44f39d60f2fa050a6b4ab05ee34f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 31 May 2013 07:46:08 +0200
-Subject: [PATCH] dracut-functions.sh:get_persistent_dev() fix case for
- multipath
-
-/dev/mapper/mpath* is not a persistent device path
-
-https://bugzilla.redhat.com/show_bug.cgi?id=969068
----
- dracut-functions.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 4a0e81a..3d88c9d 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -254,6 +254,7 @@ get_persistent_dev() {
- [ -z "$_dev" ] && return
-
- for i in /dev/mapper/* /dev/disk/by-uuid/* /dev/disk/by-id/*; do
-+ [[ $i == /dev/mapper/mpath* ]] && continue
- _tmp=$(udevadm info --query=name --name="$i" 2>/dev/null)
- if [ "$_tmp" = "$_dev" ]; then
- echo $i
diff --git a/0080-dmsquash-live-dmsquash-live-root.sh-fixup-32214acb3a.patch b/0080-dmsquash-live-dmsquash-live-root.sh-fixup-32214acb3a.patch
deleted file mode 100644
index 1b90e3b..0000000
--- a/0080-dmsquash-live-dmsquash-live-root.sh-fixup-32214acb3a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d18fd0235bfdbb845eac35c6d45b06168cb37900 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 31 May 2013 09:04:55 +0200
-Subject: [PATCH] dmsquash-live/dmsquash-live-root.sh: fixup 32214acb3ae
-
----
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index f63819c..14e84e1 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -20,7 +20,7 @@ livedev="$1"
- live_dir=$(getarg rd.live.dir -d live_dir)
- [ -z "$live_dir" ] && live_dir="LiveOS"
- squash_image=$(getarg rd.live.squashimg)
--[ -z "squash_image" ] && squash_image="squashfs.img"
-+[ -z "$squash_image" ] && squash_image="squashfs.img"
-
- getargbool 0 rd.live.ram -d -y live_ram && live_ram="yes"
- getargbool 0 rd.live.overlay.reset -d -y reset_overlay && reset_overlay="yes"
diff --git a/dracut.spec b/dracut.spec
index 5139745..f03ddf0 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -9,8 +9,8 @@
%endif
Name: dracut
-Version: 027
-Release: 82.git20130531%{?dist}
+Version: 028
+Release: 1%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -29,87 +29,7 @@ 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
-Patch10: 0010-nfs-module-setup.sh-combine-egreps-for-etc-passwd-an.patch
-Patch11: 0011-dracut-functions.sh-make-use-of-findmnt.patch
-Patch12: 0012-crypt-module-setup.sh-filter-etc-crypttab-in-host-on.patch
-Patch13: 0013-ifup.sh-Add-support-for-bridge-over-team-and-vlan-ta.patch
-Patch14: 0014-network-support-multiple-bonding-interfaces.patch
-Patch15: 0015-Wait-for-logical-interface-to-be-up.patch
-Patch16: 0016-Let-user-specify-the-action-after-fail.patch
-Patch17: 0017-ifup.sh-Add-support-for-bridge-over-a-vlan-tagged-in.patch
-Patch18: 0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch
-Patch19: 0019-Do-not-call-plymouth-with-full-path.patch
-Patch20: 0020-plymouth-plymouth-pretrigger.sh-fixup-of-ca2c6936.patch
-Patch21: 0021-AUTHORS-update.patch
-Patch22: 0022-Makefile-git2spec.pl-use-git-describe.patch
-Patch23: 0023-systemd-include-the-systemd-random-seed-load.service.patch
-Patch24: 0024-url-lib-module-setup.sh-install-ca-bundle.crt-by-lib.patch
-Patch25: 0025-dmsquash-live-add-support-for-iso-scan-filename-kern.patch
-Patch26: 0026-Makefile-fixup-tarball-Makefile.patch
-Patch27: 0027-lsinitrd-switch-to-getopt-and-add-f-and-k-parameter.patch
-Patch28: 0028-lsinitrd-add-bash-completion.patch
-Patch29: 0029-dracut-bash-completion.sh-file-filename-completion.patch
-Patch30: 0030-lsinitrd-drop-use-of-file.patch
-Patch31: 0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch
-Patch32: 0032-.gitignore-ignore-more-files.patch
-Patch33: 0033-Makefile-remove-dracut-version.sh-on-clean.patch
-Patch34: 0034-base-dracut-lib.sh-do-not-setdebug-if-not-in-initram.patch
-Patch35: 0035-dracut-install-error-out-if-ldd-reports-no-execution.patch
-Patch36: 0036-shutdown-redirect-output-to-dev-console-only-if-it-e.patch
-Patch37: 0037-fixup-3be5d63c2f.patch
-Patch38: 0038-fixed-fips-mode.patch
-Patch39: 0039-dracut.sh-do-not-preunlink-for-fips-mode.patch
-Patch40: 0040-fips-do-not-fail-immediatly-after-loading-the-crypto.patch
-Patch41: 0041-dracut-install-make-use-of-_cleanup_-macros.patch
-Patch42: 0042-_emergency_shell-Show-current-working-directory-corr.patch
-Patch43: 0043-test-use-grep-option-F-and-install-etc-os-release.patch
-Patch44: 0044-zfcp-match-udev-rule-against-KERNEL-zfcp.patch
-Patch45: 0045-usrmount-Fix-miss-detection-of-btrfs-subvolumes.patch
-Patch46: 0046-dracut.sh-degrade-message-about-missing-tools-for-st.patch
-Patch47: 0047-don-t-specify-p-as-a-separator-for-dmraid-arrays-RHB.patch
-Patch48: 0048-systemd-set-environment-vars-DRACUT_SYSTEMD-NEWROOT-.patch
-Patch49: 0049-don-t-add-volatile-swap-partitions-to-host_devs.patch
-Patch50: 0050-dracut-functions.sh-clarify-instmods-error-message.patch
-Patch51: 0051-01fips-module-setup.sh-add-libssl.so.10-to-make-kdum.patch
-Patch52: 0052-Fix-parsing-command-line-arguments.patch
-Patch53: 0053-Introduce-stricter-type-correctness.patch
-Patch54: 0054-Use-consistiently-termination-code-macros.patch
-Patch55: 0055-Always-check-the-return-number-of-asprintf.patch
-Patch56: 0056-Fix-memory-leak.patch
-Patch57: 0057-dracut.spec-put-selinux-for-kdump-crash-file-context.patch
-Patch58: 0058-url-lib-url-lib.sh-turn-off-curl-globbing.patch
-Patch59: 0059-btrfs-include-btrfs-zero-log-in-the-initramfs.patch
-Patch60: 0060-ifcfg-write-ifcfg.sh-proper-NAME-the-interfaces.patch
-Patch61: 0061-40network-Provide-a-hostname-fallback-function-in-ca.patch
-Patch62: 0062-dracut-emergency.service-do-not-start-for-action_on_.patch
-Patch63: 0063-i18n-module-setup.sh-install-default-font-latarcyrhe.patch
-Patch64: 0064-crypt-loop-module-setup.sh-install-loop-kernel-modul.patch
-Patch65: 0065-udev-rules-module-setup.sh-optionally-install-etc-pc.patch
-Patch66: 0066-ifcfg-write-ifcfg.sh.patch
-Patch67: 0067-kernel-modules-module-setup.sh-add-nvme-kernel-modul.patch
-Patch68: 0068-fs-lib-module-setup.sh-add-xfs_metadump.patch
-Patch69: 0069-99fs-lib-fs-lib.sh-Let-user-specify-the-action-after.patch
-Patch70: 0070-use-system-provides-udev-rule-and-initialization-scr.patch
-Patch71: 0071-selinux-load_policy-script-fix.patch
-Patch72: 0072-base-dracut-lib.sh-export-DRACUT_SYSTEMD-and-NEWROOT.patch
-Patch73: 0073-kernel-modules-module-setup.sh-add-hid-hyperv-and-hv.patch
-Patch74: 0074-dmsquash-live-dmsquash-live-root.sh-add-parameter-rd.patch
-Patch75: 0075-systemd-emergency.service-do-not-run-for-action_on_f.patch
-Patch76: 0076-network-wait-for-all-required-interfaces-if-rd.needn.patch
-Patch77: 0077-lvm-add-tools-for-thin-provisioning.patch
-Patch78: 0078-ifcfg-write-ifcfg.sh-fixed-logic.patch
-Patch79: 0079-dracut-functions.sh-get_persistent_dev-fix-case-for-.patch
-Patch80: 0080-dmsquash-live-dmsquash-live-root.sh-fixup-32214acb3a.patch
-Patch81: 0001-include-panel-tfp410-module-on-arm-systems-in-the-in.patch
+
BuildRequires: dash bash git
@@ -516,6 +436,19 @@ rm -rf $RPM_BUILD_ROOT
%{dracutlibdir}/dracut.conf.d/02-norescue.conf
%changelog
+* Wed Jun 12 2013 Harald Hoyer <harald@redhat.com> 028-1
+- lvm: fixed "thin" recognition
+Resolves: rhbz#921235
+- install libs also from one dir above
+ fixes booting power6 generated initramfs on power7
+- setup correct system time and time zone in initrd
+- cms fixups
+Resolves: rhbz#970982 rhbz#971025 rhbz#825199
+- iso-scan/filename fixes
+Resolves: rhbz#972337
+- add udev rules for persistent network naming
+Resolves: rhbz#972662
+
* Tue Jun 04 2013 Dennis Gilmore <dennis@ausil.us> 027-82.git20130531
- add patch to include panel-tfp410 module on arm systems
diff --git a/sources b/sources
index 8c9a346..3cc23c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a45b7a3a7bab16d3b6d4fbe782b3adcf dracut-027.tar.bz2
+98ddf2ffe113259cf73d01f31fe8ee51 dracut-028.tar.bz2