From ac1230e9f0954747de1b0de93152aafd9262a26bfd2f35aceacead245f27c8ef Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 1 Mar 2017 13:29:19 +0000 Subject: [PATCH 1/6] Whitespace fixes applied by osc OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=287 --- dracut.changes | 122 ++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/dracut.changes b/dracut.changes index 3c9d8d9..3c3c26f 100644 --- a/dracut.changes +++ b/dracut.changes @@ -26,7 +26,7 @@ Thu Jan 26 10:10:58 UTC 2017 - daniel.molkentin@suse.com ------------------------------------------------------------------- Mon Jan 16 19:44:07 UTC 2017 - daniel.molkentin@suse.com -- Add md4 and arc4 modules for ntlm authentication +- Add md4 and arc4 modules for ntlm authentication * add 0454-Add-md4-and-arc4-modules-for-ntlm.patch ------------------------------------------------------------------- @@ -71,7 +71,7 @@ Tue Nov 8 15:19:37 UTC 2016 - daniel@molkentin.de - systemd-initrd: Add initrd-root-device.target. Cherry-pick to get systemd v230 into factory (bsc1009089) - * add 0451-systemd-initrd-add-initrd-root-device.target.patch + * add 0451-systemd-initrd-add-initrd-root-device.target.patch ------------------------------------------------------------------- Mon Nov 7 15:54:09 UTC 2016 - dmolkentin@suse.de @@ -186,7 +186,7 @@ Thu Sep 1 17:11:17 UTC 2016 - opensuse@dstoecker.de Wed Aug 31 19:06:19 UTC 2016 - trenn@suse.de - Add missing whitespace for md raid suse kernel param parsing (bsc#970215) -*modify: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch +*modify: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch - Fix IFS separater in net-lib.sh (bsc#996141) *modify: 0125-40network-separate-mask-and-prefix.patch @@ -227,7 +227,7 @@ Thu Aug 25 11:59:56 CEST 2016 - hare@suse.de * Add 0305-90multipath-load-dm_multipath-module-during-startup.patch - 90multipath: add shutdown script (bsc#994860) * Add 0306-90multipath-add-shutdown-script.patch - + ------------------------------------------------------------------- Tue Aug 23 13:36:18 CEST 2016 - hare@suse.de @@ -621,7 +621,7 @@ Wed Oct 14 12:51:54 UTC 2015 - trenn@suse.de - Always install dm-snaphost module if lvm dracut module is needed, even if dm-snampshot is not loaded on the host yet (bsc#947518) -A 0128-90lvm-Install-dm-snapshot-module.patch +A 0128-90lvm-Install-dm-snapshot-module.patch ------------------------------------------------------------------- Tue Oct 6 10:28:35 UTC 2015 - fvogt@suse.com @@ -659,7 +659,7 @@ Mon Sep 21 13:18:43 UTC 2015 - fvogt@suse.com - Add patch 0182-fix-include-parsing.patch: - Fix parsing of "-i" and "--include" -- Fixes boo#908452 +- Fixes boo#908452 ------------------------------------------------------------------- Mon Sep 21 10:45:14 UTC 2015 - fvogt@suse.com @@ -686,7 +686,7 @@ Mon Sep 14 11:33:51 UTC 2015 - thomas.blume@suse.com Fri Sep 11 11:06:46 UTC 2015 - fvogt@suse.com - Add 0401-mount_option_mountpoint.patch: - Make it possible to use a mountpoint as --mount parameter + Make it possible to use a mountpoint as --mount parameter ------------------------------------------------------------------- Fri Sep 11 10:56:42 UTC 2015 - fvogt@suse.com @@ -946,7 +946,7 @@ Tue Mar 24 15:37:48 UTC 2015 - trenn@suse.de 0102-Align-dev_unit_name-with-systemd-s-function.patch 0001-kernel-modules-Fix-storage-module-selection-for-sdhc.patch -- Added dracut_v041_to_HEAD.patch: new patch from v041 against our git +- Added dracut_v041_to_HEAD.patch: new patch from v041 against our git ------------------------------------------------------------------- Fri Feb 27 18:37:56 UTC 2015 - sfalken@opensuse.org @@ -954,7 +954,7 @@ Fri Feb 27 18:37:56 UTC 2015 - sfalken@opensuse.org - Add patch to load logitech-hidpp module in default initrd, fixes issues with not being able to enter LUKS password with logitech wireless keyboards (boo#918938) - + Added: 0170-enable-logitech-hidpp.patch + + Added: 0170-enable-logitech-hidpp.patch ------------------------------------------------------------------- Mon Feb 23 16:13:16 UTC 2015 - meissner@suse.com @@ -1010,17 +1010,17 @@ Sat Nov 22 06:26:37 UTC 2014 - arvidjaar@gmail.com ------------------------------------------------------------------- Wed Oct 15 16:07:47 UTC 2014 - trenn@suse.de -- dracut-initrd-restore.patch: dracut-shutdown.service invokes - dracut-initramfs-restore script which will never work in +- dracut-initrd-restore.patch: dracut-shutdown.service invokes + dracut-initramfs-restore script which will never work in openSUSE because initrd images are named initrd not initramfs. Patch is from: Cristian Rodríguez -* Add 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch +* Add 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch ------------------------------------------------------------------- Wed Oct 8 17:29:35 UTC 2014 - spargaonkar@suse.com - Overwrite/generate modules.dep file using depmod since the file - modules.dep is not portable across releases (bsc#874621). + modules.dep is not portable across releases (bsc#874621). ------------------------------------------------------------------- Thu Oct 2 14:33:20 UTC 2014 - trenn@suse.de @@ -1705,21 +1705,21 @@ Thu Apr 10 14:49:23 UTC 2014 - trenn@suse.de ------------------------------------------------------------------- Wed Apr 9 16:47:27 UTC 2014 - crrodriguez@opensuse.org -- Remove the bootchart module, note that we still keep +- Remove the bootchart module, note that we still keep the systemd-bootchart one which provides similar functionality. ------------------------------------------------------------------- Wed Apr 9 16:42:49 UTC 2014 - crrodriguez@opensuse.org -- Remove the busybox module we have all basic tools already +- Remove the busybox module we have all basic tools already in the initrd -- _unitdir is always defined nowadays, remove the conditionals. +- _unitdir is always defined nowadays, remove the conditionals. ------------------------------------------------------------------- Wed Apr 9 14:48:12 UTC 2014 - sfalken@opensuse.org - Replaced dracut tarball with proper upstream tarball - Add: dracut-037.tar.xz + Add: dracut-037.tar.xz ------------------------------------------------------------------- Tue Apr 8 10:16:16 CEST 2014 - hare@suse.de @@ -1747,14 +1747,14 @@ Tue Apr 8 10:16:16 CEST 2014 - hare@suse.de ------------------------------------------------------------------- Thu Apr 3 23:59:31 UTC 2014 - crrodriguez@opensuse.org -- revert last change, ucode-intel is not mandatory and +- revert last change, ucode-intel is not mandatory and will get installed by default anyway, either via patterns or by modalias dependencies in the package itself. ------------------------------------------------------------------- Thu Apr 3 19:07:30 UTC 2014 - crrodriguez@opensuse.org -- Require package ucode-intel in x86* +- Require package ucode-intel in x86* ------------------------------------------------------------------- Tue Apr 1 06:23:28 UTC 2014 - nfbrown@suse.com @@ -1782,7 +1782,7 @@ Tue Mar 25 18:18:56 UTC 2014 - trenn@suse.de Fri Mar 14 19:49:38 UTC 2014 - rmilasan@suse.com - Add support for 70-persistent-net.rules in dracut (bnc#868375) - Add: dracut-install-persistent-rule.patch + Add: dracut-install-persistent-rule.patch ------------------------------------------------------------------- Fri Mar 14 15:09:37 UTC 2014 - trenn@suse.de @@ -1809,7 +1809,7 @@ Wed Mar 5 15:25:32 UTC 2014 - pwieczorkiewicz@suse.com * In case of no network related params are specified, but rd.neednet=1 is set, default initqueue action is to wait until one of the network interfaces is marked as set up properly. (bnc#866771) - * It also helps with initqueue's race condition when network interface + * It also helps with initqueue's race condition when network interface shows up late. - replace_dhclient_with_wickedd_dhcp_supplicants.patch: Add a missing network setup flag. (bnc#866771) @@ -1902,22 +1902,22 @@ Thu Feb 13 14:09:55 UTC 2014 - pwieczorkiewicz@suse.com ------------------------------------------------------------------- Thu Feb 13 06:28:01 UTC 2014 - sfalken@opensuse.org --Added bug number to previous changelog entry +-Added bug number to previous changelog entry ------------------------------------------------------------------- Thu Feb 13 05:40:32 UTC 2014 - sfalken@opensuse.org --Updated suse_grub_manpage.patch to further correct for incorrect grub configuration paths +-Updated suse_grub_manpage.patch to further correct for incorrect grub configuration paths bnc#858448 ------------------------------------------------------------------- Wed Feb 12 21:42:55 UTC 2014 - sfalken@opensuse.org --Updated suse_grub_manpage.patch for dracut-036 +-Updated suse_grub_manpage.patch for dracut-036 ------------------------------------------------------------------- Wed Feb 12 12:48:16 UTC 2014 - sfalken@opensuse.org --Added patch to fix manpage to reflect openSUSE GRUB Legacy and GRUB2 +-Added patch to fix manpage to reflect openSUSE GRUB Legacy and GRUB2 - removed patches: * dracut_git_v034_to_head.patch @@ -1981,7 +1981,7 @@ Drop: dracut-git-update.patch Rebase: 0013-Correct-paths-for-openSUSE.patch This is a rename of dracut-git-update.patch to: -Add: dracut_git_v034_to_head.patch +Add: dracut_git_v034_to_head.patch ------------------------------------------------------------------- Fri Dec 20 14:17:54 UTC 2013 - trenn@suse.de @@ -2060,38 +2060,38 @@ Mon Oct 21 00:13:48 UTC 2013 - hrvoje.senjan@gmail.com ------------------------------------------------------------------- Thu Oct 17 02:22:43 UTC 2013 - crrodriguez@opensuse.org -- remove use_all_paths_udev.patch, /lib/udev.. is a symlink +- remove use_all_paths_udev.patch, /lib/udev.. is a symlink to /usr nowadays this confuses other parts of the code causing errors/warnings during the initrd generation. ------------------------------------------------------------------- Mon Oct 14 03:48:40 UTC 2013 - crrodriguez@opensuse.org -- version 034 +- version 034 * fcoe: add FCoE UEFI boot device support -* rootfs-block: add support for the rootfallback= kernel +* rootfs-block: add support for the rootfallback= kernel cmdline option * btrfs: use inst_hook to install the timeout hook ------------------------------------------------------------------- Sun Oct 13 15:25:37 UTC 2013 - tittiatcoke@gmail.com -- Correct patch mkinitrd-fix-boot-dir-detection. (";;" doesn't +- Correct patch mkinitrd-fix-boot-dir-detection. (";;" doesn't really work) ------------------------------------------------------------------- Wed Oct 9 10:59:01 UTC 2013 - tittiatcoke@gmail.com -- Updated the patch mkinitrd-fix-boot-dir-detection.patch to a - more generic validation that the inidcated initrd file doesn't - contain a path. If no path is given, then add the default +- Updated the patch mkinitrd-fix-boot-dir-detection.patch to a + more generic validation that the inidcated initrd file doesn't + contain a path. If no path is given, then add the default boot_dir. ------------------------------------------------------------------- Tue Oct 8 18:59:30 UTC 2013 - tittiatcoke@gmail.com - Fix again the mkinitrd script as that people don't seem to test. - Added mkinitrd-fix-boot-dir-detection.patch so that an initrd + Added mkinitrd-fix-boot-dir-detection.patch so that an initrd is created. ------------------------------------------------------------------- @@ -2117,20 +2117,20 @@ Mon Oct 7 08:58:00 UTC 2013 - trenn@suse.de ------------------------------------------------------------------- Fri Oct 4 17:23:19 UTC 2013 - tittiatcoke@gmail.com -- Add patch mkinitrd_update_bootloader.diff so that after +- Add patch mkinitrd_update_bootloader.diff so that after generating the initrd, the update-bootloader is called to update grub2. ------------------------------------------------------------------- Fri Oct 4 16:26:20 UTC 2013 - tittiatcoke@gmail.com -- Validate that the parameters passed with -i (initrd file) does +- Validate that the parameters passed with -i (initrd file) does not already contain the boot_dir. ------------------------------------------------------------------- Fri Oct 4 09:58:17 UTC 2013 - tittiatcoke@gmail.com -- Bring back the versioned Provides/Obsoletes for mkinitrd. +- Bring back the versioned Provides/Obsoletes for mkinitrd. Otherwise we run into issues as that udev is conflicting with mkinitrd < 2.7.0 @@ -2190,13 +2190,13 @@ Wed Sep 25 15:17:57 UTC 2013 - trenn@suse.de ------------------------------------------------------------------- Sat Sep 21 17:36:13 UTC 2013 - crrodriguez@opensuse.org -- save a few seconds on boot by always including the autofs4 +- save a few seconds on boot by always including the autofs4 kernel module in the initrd ------------------------------------------------------------------- Sat Sep 21 17:31:15 UTC 2013 - crrodriguez@opensuse.org -- dracut 033 +- dracut 033 - improved hostonly device recognition - improved hostonly module recognition - do not install udev rules from /etc in generic mode @@ -2216,7 +2216,7 @@ Mon Sep 9 01:09:44 UTC 2013 - crrodriguez@opensuse.org ------------------------------------------------------------------- Mon Sep 9 00:23:56 UTC 2013 - crrodriguez@opensuse.org -- version 032 +- version 032 - add parameter --print-cmdline - dracut now creates the initramfs without udevadm that means the udev database does not have to populated @@ -2252,14 +2252,14 @@ Mon Aug 5 04:30:48 UTC 2013 - crrodriguez@opensuse.org ------------------------------------------------------------------- Sat Aug 3 07:10:55 UTC 2013 - tittiatcoke@gmail.com -- Drop the buildrequire for the microcode_ctl. This package - is no longer in Factory and with the latest kernel (3.11) +- Drop the buildrequire for the microcode_ctl. This package + is no longer in Factory and with the latest kernel (3.11) no longer required. ------------------------------------------------------------------- Sun Jul 28 00:39:55 UTC 2013 - crrodriguez@opensuse.org -- version 030_git201307241235 +- version 030_git201307241235 * systemd: Replace prefdm.service with display-manager.service * modsign: do not install, if no keys present * bcache: add support for bcache @@ -2268,9 +2268,9 @@ Sun Jul 28 00:39:55 UTC 2013 - crrodriguez@opensuse.org ------------------------------------------------------------------- Sun Jul 21 17:17:58 UTC 2013 - tittiatcoke@gmail.com -- Remove the http link for the Source0. Git snapshots can - not be obtained that way. - +- Remove the http link for the Source0. Git snapshots can + not be obtained that way. + ------------------------------------------------------------------- Wed Jul 17 20:25:58 UTC 2013 - crrodriguez@opensuse.org @@ -2280,12 +2280,12 @@ Wed Jul 17 20:25:58 UTC 2013 - crrodriguez@opensuse.org ------------------------------------------------------------------- Thu Jun 27 19:41:46 UTC 2013 - crrodriguez@opensuse.org -- Require pigz instead of gzip +- Require pigz instead of gzip ------------------------------------------------------------------- Tue Jun 18 00:48:24 UTC 2013 - crrodriguez@opensuse.org -- version 029 +- version 029 * fixes for the networking modules * fixes for systemd integration * fixes for the i18n module (removes dracut-font.patch now upstream) @@ -2301,12 +2301,12 @@ Thu Jun 6 19:20:47 UTC 2013 - crrodriguez@opensuse.org ------------------------------------------------------------------- Wed May 8 23:05:40 UTC 2013 - crrodriguez@opensuse.org -- Recommend pigz for faster/parallel compression +- Recommend pigz for faster/parallel compression ------------------------------------------------------------------- Sat Apr 20 14:55:20 UTC 2013 - crrodriguez@opensuse.org -- Ensure we use display-manager.service instead of prefdm. +- Ensure we use display-manager.service instead of prefdm. ------------------------------------------------------------------- Mon Apr 15 00:59:59 UTC 2013 - crrodriguez@opensuse.org @@ -2341,7 +2341,7 @@ Tue Mar 19 21:32:09 UTC 2013 - crrodriguez@opensuse.org - Update to 026_git201303180829 * bugfixes * adds bash completion Support -- Most importantly, fix the (silly) compatibility patch +- Most importantly, fix the (silly) compatibility patch that changes the name from initramfs to initrd that went broken in last update (all initrds were suffixed by .img) @@ -2369,7 +2369,7 @@ Tue Mar 12 22:01:14 UTC 2013 - crrodriguez@opensuse.org - enable initramfs building without kernel modules (fixed regression) - in the initqueue/timeout, reset the main loop counter, as we see new udev events or initqueue/work -- fixed udev rule installation +- fixed udev rule installation ------------------------------------------------------------------- Fri Feb 22 00:16:46 UTC 2013 - crrodriguez@opensuse.org @@ -2392,7 +2392,7 @@ Sun Feb 3 02:07:39 UTC 2013 - crrodriguez@opensuse.org ------------------------------------------------------------------- Mon Jan 28 17:52:28 UTC 2013 - crrodriguez@opensuse.org -- Require modutils instead of module-init-tools. +- Require modutils instead of module-init-tools. ------------------------------------------------------------------- Thu Jan 24 09:57:18 UTC 2013 - hrvoje.senjan@gmail.com @@ -2409,29 +2409,29 @@ Thu Jan 24 09:57:18 UTC 2013 - hrvoje.senjan@gmail.com + add team device support + add pre-shutdown hook + kill all processes in shutdown and report remaining ones - + "--device" changed to "--add-device" and "add_device=" added + + "--device" changed to "--add-device" and "add_device=" added for conf files + add memory usage trace to different hook points + cope with optional field #7 in /proc/self/mountinfo - + lots of small bugfixes + + lots of small bugfixes ------------------------------------------------------------------- Thu Dec 6 20:15:41 UTC 2012 - crrodriguez@opensuse.org - dracut wants "strip" installed which is part of binutils - recommend that package + recommend that package ------------------------------------------------------------------- Mon Nov 5 08:44:30 UTC 2012 - tittiatcoke@gmail.com -- Added additional patches to make dracut work in an openSUSE +- Added additional patches to make dracut work in an openSUSE environment. - Added patch (use_all_paths_udev.patch) to use both /usr/lib/udev and /lib/udev as long as not all packages migrated. -- Added patch (use_initrd_insteadof_initramfs.patch) to change +- Added patch (use_initrd_insteadof_initramfs.patch) to change the naming of the generated initrd file to be more openSUSE -- Added patch (use_sysconfig_values_correctly.patch) to read the +- Added patch (use_sysconfig_values_correctly.patch) to read the correct keymap value from /etc/sysconfig. (.gz extension) ------------------------------------------------------------------- @@ -2441,7 +2441,7 @@ Thu Nov 1 17:47:45 UTC 2012 - tittiatcoke@gmail.com + new dracut option "--device" + new dracut kernel command line options "rd.auto" + new dracut kernel command line options "rd.noverifyssl" - + new dracut option "--kernel-cmdline" and "kernel_cmdline" + + new dracut option "--kernel-cmdline" and "kernel_cmdline" option for default parameters + fixes for systemd and crypto + fix for kexec in shutdown, if not included in initramfs @@ -2451,7 +2451,7 @@ Thu Nov 1 17:47:45 UTC 2012 - tittiatcoke@gmail.com + various FIPS fixes + various dracut-install fixes -- Added patch (correct-paths-for-opensuse.patch) to ensure correct +- Added patch (correct-paths-for-opensuse.patch) to ensure correct paths for openSUSE (Plymouth) ------------------------------------------------------------------- From 3870aa0105346c46ea0600bf13ccf1bba114f584b970c25874f0f5da46b95bf0 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 1 Mar 2017 13:30:24 +0000 Subject: [PATCH 2/6] - 01fips: Remove zlib module as requirement (bsc#1020063) * add 0509-01fips-Remove-zlib-module-as-requirement.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=288 --- ...ps-Remove-zlib-module-as-requirement.patch | 27 +++++++++++++++++++ dracut.changes | 6 +++++ dracut.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 0509-01fips-Remove-zlib-module-as-requirement.patch diff --git a/0509-01fips-Remove-zlib-module-as-requirement.patch b/0509-01fips-Remove-zlib-module-as-requirement.patch new file mode 100644 index 0000000..1076be7 --- /dev/null +++ b/0509-01fips-Remove-zlib-module-as-requirement.patch @@ -0,0 +1,27 @@ +From 17eff2759ab2d5e3622864fb06a7657c7f95bfd3 Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Wed, 1 Mar 2017 11:43:39 +0100 +Subject: [PATCH] 01fips: Remove zlib module as requirement + +zlib has been removed from the upstream kernel, affecting SLE12SP3. +This patch must not be backported to SLE12SP2 and earlier (bsc#1020063). +--- + 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 0bca7a1..e29af08 100755 +--- a/modules.d/01fips/module-setup.sh ++++ b/modules.d/01fips/module-setup.sh +@@ -17,7 +17,7 @@ installkernel() { + _fipsmodules+="ctr cts deflate drbg " + _fipsmodules+="ecb fcrypt gcm ghash_generic khazad md4 michael_mic rmd128 " + _fipsmodules+="rmd160 rmd256 rmd320 seed " +- _fipsmodules+="sha512_generic tcrypt tea wp512 xts zlib " ++ _fipsmodules+="sha512_generic tcrypt tea wp512 xts " + _fipsmodules+="aes_s390 des_s390 sha256_s390 ghash_s390 sha1_s390 sha512_s390 " + _fipsmodules+="gf128mul " + _fipsmodules+="cmac vmac xcbc salsa20_generic salsa20_x86_64 camellia_generic camellia_x86_64 pcbc tgr192 anubis " +-- +2.10.2 + diff --git a/dracut.changes b/dracut.changes index 3c3c26f..4a8a3e4 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 1 13:24:19 UTC 2017 - daniel.molkentin@suse.com + +- 01fips: Remove zlib module as requirement (bsc#1020063) + * add 0509-01fips-Remove-zlib-module-as-requirement.patch + ------------------------------------------------------------------- Wed Feb 8 16:55:16 UTC 2017 - daniel.molkentin@suse.com diff --git a/dracut.spec b/dracut.spec index e597eb8..b4ba292 100644 --- a/dracut.spec +++ b/dracut.spec @@ -92,6 +92,7 @@ Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch Patch138: 0138-fips_add_aesni-intel.patch Patch139: 0139-fips-kernel-4.4-fixes.patch +Patch509: 0509-01fips-Remove-zlib-module-as-requirement.patch # Others Patch20: 0020-00warpclock-Set-correct-timezone.patch @@ -397,6 +398,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch506 -p1 %patch507 -p1 %patch508 -p1 +%patch509 -p1 %build %configure\ From c6bd0e998928ca6c09fe35390326e56513ced7d957083c8a22c48c8b3177882a Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 2 Mar 2017 15:14:47 +0000 Subject: [PATCH 3/6] - Do not pass ifname for bonding devices (bsc#995812) * add 0314-nfs_do_not_pass_ifname_for_bonding_devices.patch - Find devices by path for S390x (bsc#915218) * add s390x_persistent_device.conf OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=289 --- ..._do_not_pass_ifname_for_bonding_devices.patch | 16 ++++++++++++++++ dracut.changes | 12 ++++++++++++ dracut.spec | 7 +++++++ s390x_persistent_device.conf | 10 ++++++++++ 4 files changed, 45 insertions(+) create mode 100644 0314-nfs_do_not_pass_ifname_for_bonding_devices.patch create mode 100644 s390x_persistent_device.conf diff --git a/0314-nfs_do_not_pass_ifname_for_bonding_devices.patch b/0314-nfs_do_not_pass_ifname_for_bonding_devices.patch new file mode 100644 index 0000000..ffe87d6 --- /dev/null +++ b/0314-nfs_do_not_pass_ifname_for_bonding_devices.patch @@ -0,0 +1,16 @@ +Index: dracut-044/modules.d/95nfs/module-setup.sh +=================================================================== +--- dracut-044.orig/modules.d/95nfs/module-setup.sh 2016-12-07 11:46:32.799438777 +0100 ++++ dracut-044/modules.d/95nfs/module-setup.sh 2016-12-07 11:46:33.519479687 +0100 +@@ -57,7 +57,10 @@ cmdline() { + nfs_address=${lookup##* } + fi + ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^ ]*\).*/\1/p') +- if [ -e /sys/class/net/$ifname/address ] ; then ++ if [ -d /sys/class/net/$ifname/bonding ]; then ++ dinfo "Found bonded interface '${ifname}'. Make sure to provide an appropriate 'bond=' cmdline." ++ return ++ elif [ -e /sys/class/net/$ifname/address ] ; then + ifmac=$(cat /sys/class/net/$ifname/address) + printf 'ifname=%s:%s ' ${ifname} ${ifmac} + fi diff --git a/dracut.changes b/dracut.changes index 4a8a3e4..442b7e4 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Mar 2 15:06:01 UTC 2017 - daniel.molkentin@suse.com + +- Do not pass ifname for bonding devices (bsc#995812) + * add 0314-nfs_do_not_pass_ifname_for_bonding_devices.patch + +------------------------------------------------------------------- +Thu Mar 2 15:03:26 UTC 2017 - daniel.molkentin@suse.com + +- Find devices by path for S390x (bsc#915218) + * add s390x_persistent_device.conf + ------------------------------------------------------------------- Wed Mar 1 13:24:19 UTC 2017 - daniel.molkentin@suse.com diff --git a/dracut.spec b/dracut.spec index b4ba292..9c433f0 100644 --- a/dracut.spec +++ b/dracut.spec @@ -32,6 +32,7 @@ Source4: purge-kernels Source5: purge-kernels.service Source6: dracut-installkernel Source7: 99-debug.conf +Source8: s390x_persistent_device.conf #Network: Patch12: 0012-40network-Fix-race-condition-when-wait-for-networks.patch @@ -165,6 +166,7 @@ Patch310: 0310-95resume-Do-not-resume-on-iSCSI.patch Patch311: 0311-95iscsi-ip-ibft-is-deprecated.patch Patch312: 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch Patch313: 0313-90mdraid-Use-stock-MD-rules-to-assemble-RAID-arrays.patch +Patch314: 0314-nfs_do_not_pass_ifname_for_bonding_devices.patch # New features/improvements Patch402: 0402-driver-fail-summary.patch @@ -377,6 +379,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch311 -p1 %patch312 -p1 %patch313 -p1 +%patch314 -p1 %patch402 -p1 %patch403 -p1 @@ -435,6 +438,10 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log install -D -m 0644 dracut.conf.d/suse.conf.example %{buildroot}/usr/lib/dracut/dracut.conf.d/01-dist.conf install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-debug.conf install -m 0644 dracut.conf.d/fips.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/40-fips.conf +# bsc#915218 +%ifarch s390 s390x +install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/dracut.conf.d/10-s390x_persistent_device.conf +%endif %ifarch %ix86 x86_64 echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf diff --git a/s390x_persistent_device.conf b/s390x_persistent_device.conf new file mode 100644 index 0000000..e28dadd --- /dev/null +++ b/s390x_persistent_device.conf @@ -0,0 +1,10 @@ +# Set persistent policy by-path on s390 platforms, to prevent +# the system from hanging during the boot when vDISKs are used +# as swap devices (bsc#915218). +# +# Indeed, they are required to be present early in the boot +# process to possibly resume the system. However, since +# they are cleared after logoff/logon and the UUID will likely +# change after reinitialization, these will not be found with +# the default by-uuid policy. +persistent_policy=by-path From 76ed47d3ab0ffa7dba44eca6f2dd3baee83204f6821d59ec2f9c2e55d0e01a69 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 14 Mar 2017 10:06:21 +0000 Subject: [PATCH 4/6] installkernel: Do not throw error when used with bin-rpmpkg (bsc#1008648) OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=290 --- dracut-installkernel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dracut-installkernel b/dracut-installkernel index 94b6690..8935c70 100644 --- a/dracut-installkernel +++ b/dracut-installkernel @@ -64,8 +64,8 @@ if [ -f $INSTALL_PATH/System.map-$KERNEL_VERSION ]; then fi -if [ -f $INSTALL_PATH/$CONFIGFILE ]; then - mv $INSTALL_PATH/$CONFIGFILE \ +if [ -f .config ] && [ -f $INSTALL_PATH/$CONFIGFILE ]; then + mv -v $INSTALL_PATH/$CONFIGFILE \ $INSTALL_PATH/$CONFIGFILE.old; fi @@ -75,7 +75,7 @@ fi cp -fp $BOOTIMAGE $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION cp -fp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION -cp -fp .config $INSTALL_PATH/$CONFIGFILE +[ -f .config] && cp -fp .config $INSTALL_PATH/$CONFIGFILE # If the kernel has module support, recreate modules.dep using depmod From af328a528aeeda1a1a5ea1a1b03e70efb4f4f17f1c123251700ceebc37f90b26 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 16 Mar 2017 11:46:00 +0000 Subject: [PATCH 5/6] - installkernel: handle make bin-rpmpkg (bsc#1008648) OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=291 --- dracut.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dracut.changes b/dracut.changes index 442b7e4..9a845b2 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 11:45:01 UTC 2017 - daniel.molkentin@suse.com + +- installkernel: handle make bin-rpmpkg (bsc#1008648) + ------------------------------------------------------------------- Thu Mar 2 15:06:01 UTC 2017 - daniel.molkentin@suse.com From 25dda6be39624245e07a724d990386fefa82159093fbd789384c8f5918cae359 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 17 Mar 2017 10:21:31 +0000 Subject: [PATCH 6/6] - 01fips: Make init on non-x86_64, specifically s390x, pass (bsc#1021687) * add 0510-01fips-Some-modules-use-separators-other-than.patch * add 0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=292 --- ...me-modules-use-separators-other-than.patch | 39 +++++++++++++++ ...ps-initialization-succeeds-on-s390-x.patch | 50 +++++++++++++++++++ dracut.changes | 7 +++ dracut.spec | 4 ++ 4 files changed, 100 insertions(+) create mode 100644 0510-01fips-Some-modules-use-separators-other-than.patch create mode 100644 0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch diff --git a/0510-01fips-Some-modules-use-separators-other-than.patch b/0510-01fips-Some-modules-use-separators-other-than.patch new file mode 100644 index 0000000..bfc397a --- /dev/null +++ b/0510-01fips-Some-modules-use-separators-other-than.patch @@ -0,0 +1,39 @@ +From e8804fc3d2052000d66661ced4a03103e0176e63 Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Tue, 7 Mar 2017 11:51:17 +0100 +Subject: [PATCH] 01fips: Some modules use separators other than "-" + +We need to account for that in our exception list +of modules that are fine to fail. This only happened +on non-Intel machines, because the intel modules +use "_" as separator. + +Original-Patch-By: Marcus Meissner +Reference: bsc#1021687 +--- + modules.d/01fips/fips.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh +index 055093a..30f53b4 100755 +--- a/modules.d/01fips/fips.sh ++++ b/modules.d/01fips/fips.sh +@@ -105,11 +105,11 @@ do_fips() + # If we find some hardware specific modules and cannot load them + # it is not a problem, proceed. + if [ "$_found" = "0" ]; then +- if [ "$_module" != "${_module%-intel}" \ +- -o "$_module" != "${_module%-ssse3}" \ +- -o "$_module" != "${_module%-x86_64}" \ ++ if [ "$_module" != "${_module%intel}" \ ++ -o "$_module" != "${_module%ssse3}" \ ++ -o "$_module" != "${_module%x86_64}" \ + -o "$_module" != "${_module%z90}" \ +- -o "$_module" != "${_module%s390}" \ ++ -o "$_module" != "${_module%s390}" \ + ]; then + _found=1 + fi +-- +2.10.2 + diff --git a/0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch b/0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch new file mode 100644 index 0000000..919571d --- /dev/null +++ b/0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch @@ -0,0 +1,50 @@ +From d31f6dc51b26ac4110b2e5357a46f9b74ebd80e2 Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Wed, 15 Mar 2017 11:59:28 +0100 +Subject: [PATCH] 01fips: ensure fips initialization succeeds on s390(x) + +More modules are x86_64 only but are not matchable +by the generic postfix checks. Others are helper modules +that are not strictly needed on all platforms. Ensure +we pass FIPS init without them. + +Finally, cbc is not always compiled into the kernel -- try +adding as a module. + +Relates-to: e8804fc3d2052000d66661ced4a03103e0176e63 +Reference: bsc#1021687 +--- + modules.d/01fips/fips.sh | 3 +++ + modules.d/01fips/module-setup.sh | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh +index 30f53b4..a005b0f 100755 +--- a/modules.d/01fips/fips.sh ++++ b/modules.d/01fips/fips.sh +@@ -110,6 +110,9 @@ do_fips() + -o "$_module" != "${_module%x86_64}" \ + -o "$_module" != "${_module%z90}" \ + -o "$_module" != "${_module%s390}" \ ++ -o "$_module" == "twofish_x86_64_3way" \ ++ -o "$_module" == "ablk_helper" \ ++ -o "$_module" == "glue_helper" \ + ]; then + _found=1 + fi +diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh +index e29af08..beeb2f6 100755 +--- a/modules.d/01fips/module-setup.sh ++++ b/modules.d/01fips/module-setup.sh +@@ -23,7 +23,7 @@ installkernel() { + _fipsmodules+="cmac vmac xcbc salsa20_generic salsa20_x86_64 camellia_generic camellia_x86_64 pcbc tgr192 anubis " + _fipsmodules+="cast6_generic cast5_generic cast_common sha512_ssse3 serpent_sse2_x86_64 serpent_generic twofish_generic " + _fipsmodules+="ablk_helper cryptd twofish_x86_64_3way lrw glue_helper twofish_x86_64 twofish_common blowfish_generic " +- _fipsmodules+="blowfish_x86_64 blowfish_common des_generic " ++ _fipsmodules+="blowfish_x86_64 blowfish_common des_generic cbc " + + mkdir -m 0755 -p "${initdir}/etc/modprobe.d" + +-- +2.10.2 + diff --git a/dracut.changes b/dracut.changes index 9a845b2..adfcf5e 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 17 10:09:57 UTC 2017 - daniel.molkentin@suse.com + +- 01fips: Make init on non-x86_64, specifically s390x, pass (bsc#1021687) + * add 0510-01fips-Some-modules-use-separators-other-than.patch + * add 0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch + ------------------------------------------------------------------- Thu Mar 16 11:45:01 UTC 2017 - daniel.molkentin@suse.com diff --git a/dracut.spec b/dracut.spec index 9c433f0..d8c00c9 100644 --- a/dracut.spec +++ b/dracut.spec @@ -94,6 +94,8 @@ Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch Patch138: 0138-fips_add_aesni-intel.patch Patch139: 0139-fips-kernel-4.4-fixes.patch Patch509: 0509-01fips-Remove-zlib-module-as-requirement.patch +Patch510: 0510-01fips-Some-modules-use-separators-other-than.patch +Patch511: 0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch # Others Patch20: 0020-00warpclock-Set-correct-timezone.patch @@ -402,6 +404,8 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch507 -p1 %patch508 -p1 %patch509 -p1 +%patch510 -p1 +%patch511 -p1 %build %configure\