From e57fb00ab8a23934297547cfefbd3ccaa2cfe5ed Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 21 Jul 2018 15:33:05 +0000 Subject: [PATCH] - updated to 048 --- compressors.patch | 12 +++++----- crypttab-keyscript.patch | 20 ++++++++-------- dracut.spec | 52 ++++++++++++---------------------------- ext4.patch | 12 ---------- initrd-release.patch | 32 ++++++++++++------------- prelink-libs.patch | 16 ------------- 6 files changed, 47 insertions(+), 97 deletions(-) delete mode 100644 ext4.patch delete mode 100644 prelink-libs.patch diff --git a/compressors.patch b/compressors.patch index 0a5aa0f..349f95d 100644 --- a/compressors.patch +++ b/compressors.patch @@ -1,7 +1,7 @@ -diff -urpa dracut-047.orig/dracut.sh dracut-047/dracut.sh ---- dracut-047.orig/dracut.sh 2018-03-15 12:07:49.000000000 +0000 -+++ dracut-047/dracut.sh 2018-03-15 12:10:37.580977945 +0000 -@@ -180,8 +180,6 @@ Creates initial ramdisk images for prelo +diff -urpa dracut-048.orig/dracut.sh dracut-048/dracut.sh +--- dracut-048.orig/dracut.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/dracut.sh 2018-07-21 14:40:37.031450159 +0000 +@@ -195,8 +195,6 @@ Creates initial ramdisk images for prelo --install-optional [LIST] Install the space separated list of files into the initramfs, if they exist. --gzip Compress the generated initramfs using gzip. @@ -10,7 +10,7 @@ diff -urpa dracut-047.orig/dracut.sh dracut-047/dracut.sh --bzip2 Compress the generated initramfs using bzip2. Make sure your kernel has bzip2 decompression support compiled in, otherwise you will not be able to boot. -@@ -189,6 +187,8 @@ Creates initial ramdisk images for prelo +@@ -204,6 +202,8 @@ Creates initial ramdisk images for prelo Make sure your kernel has lzma support compiled in, otherwise you will not be able to boot. --xz Compress the generated initramfs using xz. @@ -19,7 +19,7 @@ diff -urpa dracut-047.orig/dracut.sh dracut-047/dracut.sh Make sure that your kernel has xz support compiled in, otherwise you will not be able to boot. --lzo Compress the generated initramfs using lzop. -@@ -809,6 +809,7 @@ fi +@@ -822,6 +822,7 @@ fi if ! [[ $compress ]]; then # check all known compressors, if none specified for i in pigz gzip lz4 lzop zstd lzma xz lbzip2 bzip2 cat; do diff --git a/crypttab-keyscript.patch b/crypttab-keyscript.patch index 1438099..a276b23 100644 --- a/crypttab-keyscript.patch +++ b/crypttab-keyscript.patch @@ -1,7 +1,7 @@ -diff -ur dracut-047.orig/modules.d/90crypt/cryptroot-ask.sh dracut-047/modules.d/90crypt/cryptroot-ask.sh ---- dracut-047.orig/modules.d/90crypt/cryptroot-ask.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/90crypt/cryptroot-ask.sh 2018-07-02 11:37:44.222951181 +0000 -@@ -106,6 +106,9 @@ +diff -urpa dracut-048.orig/modules.d/90crypt/cryptroot-ask.sh dracut-048/modules.d/90crypt/cryptroot-ask.sh +--- dracut-048.orig/modules.d/90crypt/cryptroot-ask.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/modules.d/90crypt/cryptroot-ask.sh 2018-07-21 14:44:47.121435253 +0000 +@@ -106,6 +106,9 @@ while [ $# -gt 0 ]; do header=*) cryptsetupopts="${cryptsetupopts} --${1}" ;; @@ -11,7 +11,7 @@ diff -ur dracut-047.orig/modules.d/90crypt/cryptroot-ask.sh dracut-047/modules.d esac shift done -@@ -163,6 +166,14 @@ +@@ -163,6 +166,14 @@ else done fi @@ -25,11 +25,11 @@ diff -ur dracut-047.orig/modules.d/90crypt/cryptroot-ask.sh dracut-047/modules.d + if [ $ask_passphrase -ne 0 ]; then luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen" - ask_for_password --ply-tries 5 \ -diff -ur dracut-047.orig/modules.d/90crypt/module-setup.sh dracut-047/modules.d/90crypt/module-setup.sh ---- dracut-047.orig/modules.d/90crypt/module-setup.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/90crypt/module-setup.sh 2018-07-02 10:57:20.952095619 +0000 -@@ -96,10 +96,26 @@ + _timeout=$(getargs "rd.luks.timeout") +diff -urpa dracut-048.orig/modules.d/90crypt/module-setup.sh dracut-048/modules.d/90crypt/module-setup.sh +--- dracut-048.orig/modules.d/90crypt/module-setup.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/modules.d/90crypt/module-setup.sh 2018-07-21 14:44:47.121435253 +0000 +@@ -97,10 +97,26 @@ install() { forceentry="yes" break ;; diff --git a/dracut.spec b/dracut.spec index 7215b1b..4bf525f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,25 +1,23 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 047 -Release: 5 +Version: 048 +Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 62d474ccb8411ec4a76ba5c79bc1093a +# Source0-md5: a9705d3c32c7523428f6e5e3e17244f8 Source1: tld.conf Source2: update-initramfs Patch1: os-release.patch Patch2: arch-libdir.patch -Patch3: prelink-libs.patch -Patch4: config.patch -Patch5: compressors.patch -Patch6: proc_sys_remount.patch -Patch7: misc_fixes.patch -Patch8: initrd-release.patch -Patch9: no_systemd_udevd.patch -Patch10: ext4.patch -Patch11: crypttab-keyscript.patch +Patch3: config.patch +Patch4: compressors.patch +Patch5: proc_sys_remount.patch +Patch6: misc_fixes.patch +Patch7: initrd-release.patch +Patch8: no_systemd_udevd.patch +Patch9: crypttab-keyscript.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash @@ -124,6 +122,7 @@ Group: Base Requires: %{name} = %{version}-%{release} Requires: hmaccalc Requires: nss-softokn-freebl +Obsoletes: dracut-fips-aesni %description fips This package requires everything which is needed to build an all @@ -134,22 +133,6 @@ Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu dracuta obrazów initramfs dowolnego przeznaczenia, wykonujących kontrolę własnej spójności. -%package fips-aesni -Summary: Dracut modules to build a dracut initramfs with an integrity check with aesni-intel -Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs z kontrolą spójności przez aesni-intel -Group: Base -Requires: %{name}-fips = %{version}-%{release} - -%description fips-aesni -This package requires everything which is needed to build an all -purpose initramfs with dracut, which does an integrity check and adds -the aesni-intel kernel module. - -%description fips-aesni -l pl.UTF-8 -Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu -dracuta obrazów initramfs dowolnego przeznaczenia wykonujących -kontrolę własnej spójności z dodanym modułem jądra aesni-intel. - %package caps Summary: Dracut modules to build a dracut initramfs which drops capabilities Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs zrzucającego uprawnienia @@ -203,8 +186,6 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh @@ -328,10 +309,10 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh %dir %{dracutlibdir}/modules.d/90multipath %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh -%dir %{dracutlibdir}/modules.d/90multipath-hostonly -%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath-hostonly/*.sh %dir %{dracutlibdir}/modules.d/90qemu %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh +%dir %{dracutlibdir}/modules.d/90stratis +%attr(755,root,root) %{dracutlibdir}/modules.d/90stratis/*.sh %dir %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-gpg/README %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh @@ -359,6 +340,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh %dir %{dracutlibdir}/modules.d/95fstab-sys %attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh +%dir %{dracutlibdir}/modules.d/95qeth_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95qeth_rules/*.sh %dir %{dracutlibdir}/modules.d/95zfcp %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh %dir %{dracutlibdir}/modules.d/95zfcp_rules @@ -458,11 +441,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh %config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf -%files fips-aesni -%defattr(644,root,root,755) -%dir %{dracutlibdir}/modules.d/02fips-aesni -%attr(755,root,root) %{dracutlibdir}/modules.d/02fips-aesni/*.sh - %files caps %defattr(644,root,root,755) %{dracutlibdir}/modules.d/02caps/README diff --git a/ext4.patch b/ext4.patch deleted file mode 100644 index ce979d8..0000000 --- a/ext4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur dracut-047.orig/modules.d/99fs-lib/module-setup.sh dracut-047/modules.d/99fs-lib/module-setup.sh ---- dracut-047.orig/modules.d/99fs-lib/module-setup.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/99fs-lib/module-setup.sh 2018-05-18 19:33:05.169511667 +0000 -@@ -41,7 +41,7 @@ - include_fs_helper_modules() { - local dev=$1 fs=$2 - case "$fs" in -- xfs|btrfs) -+ xfs|btrfs|ext4) - instmods crc32c - ;; - f2fs) diff --git a/initrd-release.patch b/initrd-release.patch index dc8f735..61613c1 100644 --- a/initrd-release.patch +++ b/initrd-release.patch @@ -1,6 +1,6 @@ -diff -urpa dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh dracut-047/modules.d/01systemd-initrd/module-setup.sh ---- dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/01systemd-initrd/module-setup.sh 2018-03-15 12:17:03.400973601 +0000 +diff -urpa dracut-048.orig/modules.d/01systemd-initrd/module-setup.sh dracut-048/modules.d/01systemd-initrd/module-setup.sh +--- dracut-048.orig/modules.d/01systemd-initrd/module-setup.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/modules.d/01systemd-initrd/module-setup.sh 2018-07-21 14:42:37.171442999 +0000 @@ -60,10 +60,8 @@ install() { echo VERSION_ID=$VERSION_ID echo PRETTY_NAME=\"$PRETTY_NAME\" @@ -13,9 +13,9 @@ diff -urpa dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh dracut-047 ln -sf initrd-release $initdir/etc/os-release } -diff -urpa dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-047/modules.d/98dracut-systemd/dracut-cmdline.sh ---- dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/98dracut-systemd/dracut-cmdline.sh 2018-03-15 12:17:03.400973601 +0000 +diff -urpa dracut-048.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-048/modules.d/98dracut-systemd/dracut-cmdline.sh +--- dracut-048.orig/modules.d/98dracut-systemd/dracut-cmdline.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/modules.d/98dracut-systemd/dracut-cmdline.sh 2018-07-21 14:42:37.171442999 +0000 @@ -5,7 +5,7 @@ if [ -f /dracut-state.sh ]; then fi type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh @@ -25,10 +25,10 @@ diff -urpa dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-0 [ -n "$VERSION" ] && info "dracut-$VERSION" if ! getargbool 1 'rd.hostonly'; then -diff -urpa dracut-047.orig/modules.d/99base/dracut-lib.sh dracut-047/modules.d/99base/dracut-lib.sh ---- dracut-047.orig/modules.d/99base/dracut-lib.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/99base/dracut-lib.sh 2018-03-15 12:17:03.400973601 +0000 -@@ -401,7 +401,7 @@ splitsep() { +diff -urpa dracut-048.orig/modules.d/99base/dracut-lib.sh dracut-048/modules.d/99base/dracut-lib.sh +--- dracut-048.orig/modules.d/99base/dracut-lib.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/modules.d/99base/dracut-lib.sh 2018-07-21 14:42:37.171442999 +0000 +@@ -406,7 +406,7 @@ splitsep() { } setdebug() { @@ -37,9 +37,9 @@ diff -urpa dracut-047.orig/modules.d/99base/dracut-lib.sh dracut-047/modules.d/9 if [ -z "$RD_DEBUG" ]; then if [ -e /proc/cmdline ]; then RD_DEBUG=no -diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/init.sh ---- dracut-047.orig/modules.d/99base/init.sh 2018-03-15 12:11:57.000000000 +0000 -+++ dracut-047/modules.d/99base/init.sh 2018-03-15 12:17:03.400973601 +0000 +diff -urpa dracut-048.orig/modules.d/99base/init.sh dracut-048/modules.d/99base/init.sh +--- dracut-048.orig/modules.d/99base/init.sh 2018-07-21 14:41:40.189446395 +0000 ++++ dracut-048/modules.d/99base/init.sh 2018-07-21 14:42:37.172442998 +0000 @@ -111,7 +111,7 @@ else exec 0<>/dev/console 1<>/dev/console 2<>/dev/console fi @@ -49,9 +49,9 @@ diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/ [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID" source_conf /etc/conf.d -diff -urpa dracut-047.orig/modules.d/99base/module-setup.sh dracut-047/modules.d/99base/module-setup.sh ---- dracut-047.orig/modules.d/99base/module-setup.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/modules.d/99base/module-setup.sh 2018-03-15 12:17:03.400973601 +0000 +diff -urpa dracut-048.orig/modules.d/99base/module-setup.sh dracut-048/modules.d/99base/module-setup.sh +--- dracut-048.orig/modules.d/99base/module-setup.sh 2018-07-06 08:37:51.000000000 +0000 ++++ dracut-048/modules.d/99base/module-setup.sh 2018-07-21 14:42:37.172442998 +0000 @@ -86,10 +86,8 @@ install() { echo VERSION_ID=$VERSION_ID echo PRETTY_NAME=\"$PRETTY_NAME\" diff --git a/prelink-libs.patch b/prelink-libs.patch deleted file mode 100644 index 5821894..0000000 --- a/prelink-libs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urpa dracut-047.orig/dracut.sh dracut-047/dracut.sh ---- dracut-047.orig/dracut.sh 2018-02-19 09:00:33.000000000 +0000 -+++ dracut-047/dracut.sh 2018-03-15 12:07:49.777979834 +0000 -@@ -1612,10 +1612,10 @@ PRELINK_BIN="$(command -v prelink)" - if [[ $EUID = 0 ]] && [[ $PRELINK_BIN ]]; then - if [[ $DRACUT_FIPS_MODE ]]; then - dinfo "*** Installing prelink files ***" -- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache -+ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache - elif [[ $do_prelink == yes ]]; then - dinfo "*** Pre-linking files ***" -- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf -+ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf - chroot "$initdir" "$PRELINK_BIN" -a - rm -f -- "$initdir/$PRELINK_BIN" - rm -fr -- "$initdir"/etc/prelink.* -- 2.46.0