From 34b00461e9fcf38b2649405ae0cd0fc9ffcbf28e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 30 Nov 2015 13:14:58 +0000 Subject: [PATCH] - updated for 044 --- arch-libdir.patch | 11 ++++++----- initrd-release.patch | 32 +++++++++++++++---------------- misc_fixes.patch | 36 +++++++++++++++++------------------ no_systemd_udevd.patch | 43 +++++++++++++++++++++++++++++++----------- os-release.patch | 11 ++++++----- plymouth-logo.patch | 7 ++++--- prelink-libs.patch | 7 ++++--- proc_sys_remount.patch | 8 ++++---- 8 files changed, 90 insertions(+), 65 deletions(-) diff --git a/arch-libdir.patch b/arch-libdir.patch index 00c3eec..aacb6c9 100644 --- a/arch-libdir.patch +++ b/arch-libdir.patch @@ -1,8 +1,9 @@ ---- dracut-033/modules.d/95resume/module-setup.sh.orig 2013-09-15 18:27:32.700252837 +0200 -+++ dracut-033/modules.d/95resume/module-setup.sh 2013-09-15 18:30:44.410244789 +0200 -@@ -17,7 +17,7 @@ - install() { - local _bin +diff -ur dracut-044.orig/modules.d/95resume/module-setup.sh dracut-044/modules.d/95resume/module-setup.sh +--- dracut-044.orig/modules.d/95resume/module-setup.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/95resume/module-setup.sh 2015-11-30 12:49:38.099305000 +0000 +@@ -43,7 +43,7 @@ + fi + # Optional uswsusp support - for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume + for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume diff --git a/initrd-release.patch b/initrd-release.patch index 7a883ec..494b6e3 100644 --- a/initrd-release.patch +++ b/initrd-release.patch @@ -1,6 +1,6 @@ -diff -ur dracut-043.orig/modules.d/01systemd-initrd/module-setup.sh dracut-043/modules.d/01systemd-initrd/module-setup.sh ---- dracut-043.orig/modules.d/01systemd-initrd/module-setup.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/01systemd-initrd/module-setup.sh 2015-08-07 17:00:41.855567301 +0000 +diff -ur dracut-044.orig/modules.d/01systemd-initrd/module-setup.sh dracut-044/modules.d/01systemd-initrd/module-setup.sh +--- dracut-044.orig/modules.d/01systemd-initrd/module-setup.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/01systemd-initrd/module-setup.sh 2015-11-30 13:03:41.479305000 +0000 @@ -59,10 +59,8 @@ echo VERSION_ID=$VERSION_ID echo PRETTY_NAME=\"$PRETTY_NAME\" @@ -13,9 +13,9 @@ diff -ur dracut-043.orig/modules.d/01systemd-initrd/module-setup.sh dracut-043/m ln -sf initrd-release $initdir/etc/os-release } -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh 2015-08-07 17:01:34.828982244 +0000 +diff -ur dracut-044.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-044/modules.d/98dracut-systemd/dracut-cmdline.sh +--- dracut-044.orig/modules.d/98dracut-systemd/dracut-cmdline.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/98dracut-systemd/dracut-cmdline.sh 2015-11-30 13:03:41.480305000 +0000 @@ -5,7 +5,7 @@ fi type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh @@ -25,10 +25,10 @@ diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-043 [ -n "$VERSION" ] && info "dracut-$VERSION" if ! getargbool 1 'rd.hostonly'; then -diff -ur dracut-043.orig/modules.d/99base/dracut-lib.sh dracut-043/modules.d/99base/dracut-lib.sh ---- dracut-043.orig/modules.d/99base/dracut-lib.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/99base/dracut-lib.sh 2015-08-07 17:00:50.435567301 +0000 -@@ -396,7 +396,7 @@ +diff -ur dracut-044.orig/modules.d/99base/dracut-lib.sh dracut-044/modules.d/99base/dracut-lib.sh +--- dracut-044.orig/modules.d/99base/dracut-lib.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/99base/dracut-lib.sh 2015-11-30 13:03:41.481305000 +0000 +@@ -394,7 +394,7 @@ } setdebug() { @@ -37,9 +37,9 @@ diff -ur dracut-043.orig/modules.d/99base/dracut-lib.sh dracut-043/modules.d/99b if [ -z "$RD_DEBUG" ]; then if [ -e /proc/cmdline ]; then RD_DEBUG=no -diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/init.sh ---- dracut-043.orig/modules.d/99base/init.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/99base/init.sh 2015-08-07 17:01:00.536567301 +0000 +diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/init.sh +--- dracut-044.orig/modules.d/99base/init.sh 2015-11-30 13:00:40.000000000 +0000 ++++ dracut-044/modules.d/99base/init.sh 2015-11-30 13:03:41.481305000 +0000 @@ -106,7 +106,7 @@ exec 0<>/dev/console 1<>/dev/console 2<>/dev/console fi @@ -49,9 +49,9 @@ diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/in [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID" source_conf /etc/conf.d -diff -ur dracut-043.orig/modules.d/99base/module-setup.sh dracut-043/modules.d/99base/module-setup.sh ---- dracut-043.orig/modules.d/99base/module-setup.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/99base/module-setup.sh 2015-08-07 17:01:25.104122302 +0000 +diff -ur dracut-044.orig/modules.d/99base/module-setup.sh dracut-044/modules.d/99base/module-setup.sh +--- dracut-044.orig/modules.d/99base/module-setup.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/99base/module-setup.sh 2015-11-30 13:03:41.482305000 +0000 @@ -84,10 +84,8 @@ echo VERSION_ID=$VERSION_ID echo PRETTY_NAME=\"$PRETTY_NAME\" diff --git a/misc_fixes.patch b/misc_fixes.patch index 52cc803..9617e60 100644 --- a/misc_fixes.patch +++ b/misc_fixes.patch @@ -1,25 +1,11 @@ -diff -urN dracut-037.orig/modules.d/95terminfo/module-setup.sh dracut-037/modules.d/95terminfo/module-setup.sh ---- dracut-037.orig/modules.d/95terminfo/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 -+++ dracut-037/modules.d/95terminfo/module-setup.sh 2014-05-17 11:39:22.293000002 +0000 -@@ -13,7 +13,9 @@ - if [ -d ${_terminfodir} ]; then - for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do - inst_dir "$_terminfodir/${i%/*}" -- cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" -+ if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then -+ cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" -+ fi - done - fi - } -diff -ur dracut-043.orig/modules.d/90lvm/module-setup.sh dracut-043/modules.d/90lvm/module-setup.sh ---- dracut-043.orig/modules.d/90lvm/module-setup.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/90lvm/module-setup.sh 2015-08-08 22:11:29.854825069 +0000 +diff -ur dracut-044.orig/modules.d/90lvm/module-setup.sh dracut-044/modules.d/90lvm/module-setup.sh +--- dracut-044.orig/modules.d/90lvm/module-setup.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/90lvm/module-setup.sh 2015-11-30 13:03:04.369305000 +0000 @@ -73,9 +73,9 @@ if [ -f /etc/lvm/lvmlocal.conf ]; then inst_simple -H /etc/lvm/lvmlocal.conf fi -- eval $(lvm dumpconfig global/system_id_source) +- eval $(lvm dumpconfig global/system_id_source &>/dev/null) + eval $(lvm dumpconfig global/system_id_source 2>/dev/null) if [ "$system_id_source" == "file" ]; then - eval $(lvm dumpconfig global/system_id_file) @@ -27,3 +13,17 @@ diff -ur dracut-043.orig/modules.d/90lvm/module-setup.sh dracut-043/modules.d/90 if [ -f "$system_id_file" ]; then inst_simple -H $system_id_file fi +diff -ur dracut-044.orig/modules.d/95terminfo/module-setup.sh dracut-044/modules.d/95terminfo/module-setup.sh +--- dracut-044.orig/modules.d/95terminfo/module-setup.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/95terminfo/module-setup.sh 2015-11-30 13:01:38.196305000 +0000 +@@ -11,7 +11,9 @@ + if [ -d ${_terminfodir} ]; then + for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do + inst_dir "$_terminfodir/${i%/*}" +- cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" ++ if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then ++ cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" ++ fi + done + fi + } diff --git a/no_systemd_udevd.patch b/no_systemd_udevd.patch index ebd33a1..e80349a 100644 --- a/no_systemd_udevd.patch +++ b/no_systemd_udevd.patch @@ -1,7 +1,7 @@ -diff -ur dracut-043.orig/modules.d/40network/net-lib.sh dracut-043/modules.d/40network/net-lib.sh ---- dracut-043.orig/modules.d/40network/net-lib.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/40network/net-lib.sh 2015-08-07 17:43:11.628527800 +0000 -@@ -39,7 +39,7 @@ +diff -ur dracut-044.orig/modules.d/40network/net-lib.sh dracut-044/modules.d/40network/net-lib.sh +--- dracut-044.orig/modules.d/40network/net-lib.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/40network/net-lib.sh 2015-11-30 13:05:18.070305000 +0000 +@@ -52,7 +52,7 @@ configured_ifaces() { local IFACES="" iface_id="" rv=1 [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces @@ -10,9 +10,30 @@ diff -ur dracut-043.orig/modules.d/40network/net-lib.sh dracut-043/modules.d/40n for iface_id in $IFACES; do echo $(iface_name $iface_id) rv=0 -diff -ur dracut-043.orig/modules.d/95udev-rules/module-setup.sh dracut-043/modules.d/95udev-rules/module-setup.sh ---- dracut-043.orig/modules.d/95udev-rules/module-setup.sh 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/95udev-rules/module-setup.sh 2015-08-07 17:44:57.498527800 +0000 +diff -ur dracut-044.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-044/modules.d/95iscsi/parse-iscsiroot.sh +--- dracut-044.orig/modules.d/95iscsi/parse-iscsiroot.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/95iscsi/parse-iscsiroot.sh 2015-11-30 13:11:06.721305000 +0000 +@@ -41,7 +41,7 @@ + netroot=$root + # if root is not specified try to mount the whole iSCSI LUN + printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules +- [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules ++ udevadm control --reload-rules + root=/dev/root + + write_fs_tab /dev/root +@@ -58,7 +58,7 @@ + if [ "${root}" = "/dev/root" ] && getarg "netroot=dhcp" ; then + # if root is not specified try to mount the whole iSCSI LUN + printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules +- [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules ++ udevadm control --reload-rules + fi + + if [ -n "$iscsiroot" ] ; then +diff -ur dracut-044.orig/modules.d/95udev-rules/module-setup.sh dracut-044/modules.d/95udev-rules/module-setup.sh +--- dracut-044.orig/modules.d/95udev-rules/module-setup.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/95udev-rules/module-setup.sh 2015-11-30 13:05:18.071305000 +0000 @@ -12,19 +12,7 @@ inst_multiple -o /etc/udev/udev.conf @@ -33,10 +54,10 @@ diff -ur dracut-043.orig/modules.d/95udev-rules/module-setup.sh dracut-043/modul + inst /sbin/udevd; inst_rules \ - 50-firmware.rules \ -diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/init.sh ---- dracut-043.orig/modules.d/99base/init.sh 2015-08-07 17:01:00.000000000 +0000 -+++ dracut-043/modules.d/99base/init.sh 2015-08-07 17:42:52.207527800 +0000 + 40-redhat.rules \ +diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/init.sh +--- dracut-044.orig/modules.d/99base/init.sh 2015-11-30 13:03:41.000000000 +0000 ++++ dracut-044/modules.d/99base/init.sh 2015-11-30 13:05:18.072305000 +0000 @@ -143,7 +143,7 @@ getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug diff --git a/os-release.patch b/os-release.patch index 8650197..3075bfd 100644 --- a/os-release.patch +++ b/os-release.patch @@ -1,8 +1,9 @@ ---- dracut-018/modules.d/50plymouth/plymouth-populate-initrd.sh~ 2012-04-05 13:54:38.000000000 +0200 -+++ dracut-018/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-04-27 13:04:05.676319178 +0200 -@@ -7,7 +7,7 @@ - inst /sbin/plymouthd /bin/plymouthd - dracut_install /bin/plymouth \ +diff -ur dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh +--- dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-11-30 12:47:19.901305000 +0000 +@@ -5,7 +5,7 @@ + + inst_multiple plymouthd plymouth \ "${PLYMOUTH_LOGO_FILE}" \ - /etc/system-release + /etc/os-release diff --git a/plymouth-logo.patch b/plymouth-logo.patch index 148428c..30a552e 100644 --- a/plymouth-logo.patch +++ b/plymouth-logo.patch @@ -1,6 +1,7 @@ ---- dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh.orig 2013-08-26 21:31:12.615640993 +0200 -+++ dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh 2013-08-27 15:35:36.416243854 +0200 -@@ -5,9 +5,10 @@ +diff -ur dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh +--- dracut-044.orig/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-11-30 12:47:19.000000000 +0000 ++++ dracut-044/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-11-30 12:48:48.898305000 +0000 +@@ -4,9 +4,10 @@ PLYMOUTH_THEME=$(plymouth-set-default-theme) inst_multiple plymouthd plymouth \ diff --git a/prelink-libs.patch b/prelink-libs.patch index 14b920d..7239029 100644 --- a/prelink-libs.patch +++ b/prelink-libs.patch @@ -1,6 +1,7 @@ ---- dracut-034/dracut.sh.orig 2013-10-20 14:13:51.740264092 +0200 -+++ dracut-034/dracut.sh 2013-10-20 14:29:50.300223867 +0200 -@@ -1266,10 +1266,10 @@ +diff -ur dracut-044.orig/dracut.sh dracut-044/dracut.sh +--- dracut-044.orig/dracut.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/dracut.sh 2015-11-30 12:50:20.168305000 +0000 +@@ -1554,10 +1554,10 @@ if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then if [[ $DRACUT_FIPS_MODE ]]; then dinfo "*** Installing prelink files ***" diff --git a/proc_sys_remount.patch b/proc_sys_remount.patch index 496f20b..ca4ee92 100644 --- a/proc_sys_remount.patch +++ b/proc_sys_remount.patch @@ -1,7 +1,7 @@ -diff -urN dracut-037.orig/modules.d/99base/init.sh dracut-037/modules.d/99base/init.sh ---- dracut-037.orig/modules.d/99base/init.sh 2014-03-19 16:16:08.000000000 +0000 -+++ dracut-037/modules.d/99base/init.sh 2014-05-17 15:55:22.273000000 +0000 -@@ -258,6 +258,26 @@ +diff -ur dracut-044.orig/modules.d/99base/init.sh dracut-044/modules.d/99base/init.sh +--- dracut-044.orig/modules.d/99base/init.sh 2015-11-25 13:22:28.000000000 +0000 ++++ dracut-044/modules.d/99base/init.sh 2015-11-30 13:00:40.396305000 +0000 +@@ -269,6 +269,26 @@ source_hook cleanup # By the time we get here, the root filesystem should be mounted. -- 2.46.0