From 7cd6b4c8bb2f2dce829aaea872921ca99295f3cf174c5edb92fe2d605666b896 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 14 Jan 2019 09:53:27 +0000 Subject: [PATCH 1/5] Accepting request 660509 from home:michals - 95zfcp_rules/parse-zfcp.sh: remove rule existence check (bsc#1008352). * adds 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch OBS-URL: https://build.opensuse.org/request/show/660509 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=358 --- ...s-parse-zfcp.sh-remove-rule-existence-check.patch | 12 ++++++++++++ dracut.changes | 6 ++++++ dracut.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch diff --git a/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch b/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch new file mode 100644 index 0000000..5f00488 --- /dev/null +++ b/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch @@ -0,0 +1,12 @@ +diff -ur dracut-044.orig/modules.d/95zfcp_rules/parse-zfcp.sh dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh +--- dracut-044.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2018-12-21 11:52:21.457034071 +0100 ++++ dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh 2018-12-21 11:56:19.179414976 +0100 +@@ -22,8 +22,6 @@ + return 0; + fi + +- [ -e ${_rule} ] && return 0 +- + if [ ! -f "$_rule" ] ; then + cat > $_rule < + +- 95zfcp_rules/parse-zfcp.sh: remove rule existence check (bsc#1008352). + * adds 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch + ------------------------------------------------------------------- Wed Oct 31 09:57:55 UTC 2018 - Daniel Molkentin diff --git a/dracut.spec b/dracut.spec index 8bd205d..e0dcc00 100644 --- a/dracut.spec +++ b/dracut.spec @@ -117,6 +117,8 @@ Patch161: 0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch Patch188: 0188-95dasd_rules-Install-collect-udev-helper-binary.patch # TODO: Apply upstream (??) Patch506: 0506-Boot-on-s390x-with-fips-1-on-the-kernel-commnad-line.patch +# TODO: Upstream ? +Patch585: 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch #FIPS Patch53: 0053-01fips-fixup-loading-issues.patch @@ -715,6 +717,7 @@ chmod a+x modules.d/95qeth_rules/module-setup.sh %patch582 -p1 %patch583 -p1 %patch584 -p1 +%patch585 -p1 %build %configure\ From ee3452de15ca8747383471847ced1efc102380e11b1d72a23e15f8aca76b8bc5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 14 Jan 2019 09:53:59 +0000 Subject: [PATCH 2/5] Accepting request 658953 from home:jdelvare:branches:Base:System dracut-installkernel: Stop keeping old kernel files as .old (boo#1112327) OBS-URL: https://build.opensuse.org/request/show/658953 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=359 --- dracut-installkernel | 45 ++------------------------------------------ dracut.changes | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 43 deletions(-) diff --git a/dracut-installkernel b/dracut-installkernel index 30576be..9a3ec99 100644 --- a/dracut-installkernel +++ b/dracut-installkernel @@ -4,11 +4,8 @@ # # May 21, 2003 - agruen@suse.de # * Adapted for SuSE and cleaned up. -# -# This file is kept in the following CVS repository: -# -# $Source: /suse/yast2/cvsroot/mkinitrd/installkernel,v $ -# $Revision: 1.8 $ +# November 21, 2018 - jdelvare@suse.de +# * Stop creating .old files. # : ${INSTALL_PATH:=/boot} @@ -35,40 +32,6 @@ case "$(uname -m)" in ;; esac -# -# Move away files from versions up to SuSE Linux 8.2 -# - -if [ -f $INSTALL_PATH/$BOOTFILE -a ! -L $INSTALL_PATH/$BOOTFILE ]; then - mv $INSTALL_PATH/$BOOTFILE $INSTALL_PATH/$BOOTFILE.old -fi - -if [ -L $INSTALL_PATH/System.map ]; then - rm -f $INSTALL_PATH/System.map -elif [ -f $INSTALLPATH/System.map ]; then - mv $INSTALL_PATH/System.map $INSTALL_PATH/System.map.old -fi - -# -# Move away files from after SuSE Linux 8.2 -# - -if [ -f $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION ]; then - mv $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION \ - $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION.old; -fi - -if [ -f $INSTALL_PATH/System.map-$KERNEL_VERSION ]; then - mv $INSTALL_PATH/System.map-$KERNEL_VERSION \ - $INSTALL_PATH/System.map-$KERNEL_VERSION.old; -fi - - -if [ -f .config ] && [ -f $INSTALL_PATH/$CONFIGFILE ]; then - mv -v $INSTALL_PATH/$CONFIGFILE \ - $INSTALL_PATH/$CONFIGFILE.old; -fi - # # Install new files # @@ -121,10 +84,6 @@ case "$(uname -m)" in i?86 | x86_64) KERNBIN=$(dirname $MAPFILE)/vmlinux if [ -e $KERNBIN ]; then - if [ -f $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz ]; then - mv $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz \ - $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz.old; - fi gzip -c $KERNBIN > $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz fi ;; diff --git a/dracut.changes b/dracut.changes index 26878a8..b1092a5 100644 --- a/dracut.changes +++ b/dracut.changes @@ -4,6 +4,22 @@ Fri Dec 21 11:02:32 UTC 2018 - Michal Suchanek - 95zfcp_rules/parse-zfcp.sh: remove rule existence check (bsc#1008352). * adds 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch +------------------------------------------------------------------- +Mon Dec 17 15:27:15 UTC 2018 - jdelvare@suse.com + +- dracut-installkernel: Stop keeping old kernel files as .old + (boo#1112327) + + The .old kernel files are confusing grub2 which can't find a + matching directory under /lib/modules. Furthermore, there is no + guarantee that the new modules are fully compatible with the old + kernel. + + If anything goes wrong with a new self-compiled kernel, the user + can always boot back to the distribution kernel, so the .old + backup files are not needed in the first place. Get rid of them + to simplify and speed up the whole process. + ------------------------------------------------------------------- Wed Oct 31 09:57:55 UTC 2018 - Daniel Molkentin From 1b61a795a19447dcadd9e939e9a8dc3bdc4c0f3abd94634037d5e5b8c9593ebd Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 21 Jan 2019 14:07:03 +0000 Subject: [PATCH 3/5] Accepting request 667609 from home:dmolkentin:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/667609 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=360 --- ...x-a-missing-space-in-example-configs.patch | 44 +++++++++++++++++++ ...c-host-modules-get-included-properly.patch | 41 +++++++++++++++++ dracut.changes | 12 +++++ dracut.spec | 13 ++++-- 4 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 0586-Fix-a-missing-space-in-example-configs.patch create mode 100644 0587-Ensure-mmc-host-modules-get-included-properly.patch diff --git a/0586-Fix-a-missing-space-in-example-configs.patch b/0586-Fix-a-missing-space-in-example-configs.patch new file mode 100644 index 0000000..d4df290 --- /dev/null +++ b/0586-Fix-a-missing-space-in-example-configs.patch @@ -0,0 +1,44 @@ +From 43b774786cc4583e682c1f7f397643c7c1fccadf Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Sun, 20 Jan 2019 21:56:05 +0100 +Subject: [PATCH] Fix a missing space in example configs + +It has + +omit_drivers+=" i2o_scsi" + +which would break the next omit_drivers+="foo " if it's +missing a space at the beginning. + +Reference: boo#1121251 +--- + dracut.conf.d/gentoo.conf.example | 2 +- + dracut.conf.d/suse.conf.example | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example +index 26e73147..df102e00 100644 +--- a/dracut.conf.d/gentoo.conf.example ++++ b/dracut.conf.d/gentoo.conf.example +@@ -12,4 +12,4 @@ ro_mnt=yes + i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE" + i18n_default_font="LatArCyrHeb-16" + +-omit_drivers+=" i2o_scsi" ++omit_drivers+=" i2o_scsi " +diff --git a/dracut.conf.d/suse.conf.example b/dracut.conf.d/suse.conf.example +index 37ffd72b..e1d800c8 100644 +--- a/dracut.conf.d/suse.conf.example ++++ b/dracut.conf.d/suse.conf.example +@@ -10,7 +10,7 @@ hostonly_cmdline="yes" + compress="xz -0 --check=crc32 --memlimit-compress=50%" + + i18n_vars="/etc/sysconfig/language:RC_LANG-LANG,RC_LC_ALL-LC_ALL /etc/sysconfig/console:CONSOLE_UNICODEMAP-FONT_UNIMAP,CONSOLE_FONT-FONT,CONSOLE_SCREENMAP-FONT_MAP /etc/sysconfig/keyboard:KEYTABLE-KEYMAP" +-omit_drivers+=" i2o_scsi" ++omit_drivers+=" i2o_scsi " + + # Below adds additional tools to the initrd which are not urgently necessary to + # bring up the system, but help to debug problems. +-- +2.16.4 + diff --git a/0587-Ensure-mmc-host-modules-get-included-properly.patch b/0587-Ensure-mmc-host-modules-get-included-properly.patch new file mode 100644 index 0000000..99470f9 --- /dev/null +++ b/0587-Ensure-mmc-host-modules-get-included-properly.patch @@ -0,0 +1,41 @@ +From 68777f36a4041f520197531e94a1b909801e67d9 Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Mon, 21 Jan 2019 14:21:14 +0100 +Subject: [PATCH] Ensure mmc host modules get included properly + +This fixes an in incorrect part of the backport in +1229cbc091ac11434b0b628d58630ce4c8fbe8e3 +aka Adjust-driver-list-to-modern-kernels.patch + +Patch is not applicable for 049 + +Reference: bsc#1119037 +--- + modules.d/90kernel-modules/module-setup.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index cc6a9309..79e615a6 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -5,6 +5,9 @@ installkernel() { + if [[ -z $drivers ]]; then + block_module_filter() { + local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host' ++ if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then ++ _blockfuncs+='|dw_mc_probe|dw_mci_pltfm_register' ++ fi + # subfunctions inherit following FDs + local _merge=8 _side2=9 + function bmf1() { +@@ -59,7 +62,6 @@ installkernel() { + + if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then + # arm/aarch64 specific modules +- _blockfuncs+='|dw_mc_probe|dw_mci_pltfm_register' + instmods \ + "=drivers/clk" \ + "=drivers/dma" \ +-- +2.16.4 + diff --git a/dracut.changes b/dracut.changes index b1092a5..b5c2707 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jan 21 14:01:20 UTC 2019 - Daniel Molkentin + +- Ensure mmc host modules get included properly (bsc#1119037) + * adds 0587-Ensure-mmc-host-modules-get-included-properly.patch + +------------------------------------------------------------------- +Sun Jan 20 21:11:06 UTC 2019 - Daniel Molkentin + +- Fix a missing space in example configs (boo#1121251) + * adds 0586-Fix-a-missing-space-in-example-configs.patch + ------------------------------------------------------------------- Fri Dec 21 11:02:32 UTC 2018 - Michal Suchanek diff --git a/dracut.spec b/dracut.spec index e0dcc00..65a945c 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -117,8 +117,6 @@ Patch161: 0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch Patch188: 0188-95dasd_rules-Install-collect-udev-helper-binary.patch # TODO: Apply upstream (??) Patch506: 0506-Boot-on-s390x-with-fips-1-on-the-kernel-commnad-line.patch -# TODO: Upstream ? -Patch585: 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch #FIPS Patch53: 0053-01fips-fixup-loading-issues.patch @@ -415,7 +413,12 @@ Patch582: 0582-98dracut-systemd-Start-systemd-vconsole-setup-before.patch Patch583: 0583-99base-Allow-files-with-backslashes-in-hostonly-file.patch # Patch adopted from upstream commit b38b7fef36333a59890233dccfbbb6d2c40ebe83 Patch584: 0584-95dasd_rules-mark-dasd-rules-host_only.patch - +# Patch adopted from git commit 69198cba654cb81093e36cca242481d26bec4b40 +Patch585: 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch +# Patch adopted from upstream commit 58e0d2d5b5b3a5e7d6dbf74baa2f08f041de5a81 +Patch586: 0586-Fix-a-missing-space-in-example-configs.patch +# Fix for 0562-Adjust-driver-list-to-modern-kernels.patch +Patch587: 0587-Ensure-mmc-host-modules-get-included-properly.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -718,6 +721,8 @@ chmod a+x modules.d/95qeth_rules/module-setup.sh %patch583 -p1 %patch584 -p1 %patch585 -p1 +%patch586 -p1 +%patch587 -p1 %build %configure\ From 3e7d1873a89a9c90098447dda5f79ce928d98139bfbf5d5adab320a02dc170c4 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 21 Jan 2019 14:33:39 +0000 Subject: [PATCH 4/5] Accepting request 667615 from home:dmolkentin:branches:Base:System * adds 0588-Ensure-mmc-host-modules-get-included-properly.patch * adds 0587-Fix-a-missing-space-in-example-configs.patch * adds 0586-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch - emergency mode: bring shell and all vital information to all ttys specified as console devices (FATE#325386, bsc#1053248, bsc#937555) * Adds 0585-emergency-mode-use-sulogin.patch OBS-URL: https://build.opensuse.org/request/show/667615 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=361 --- 0585-emergency-mode-use-sulogin.patch | 96 +++++++++++++++++++ ...-zfcp.sh-remove-rule-existence-check.patch | 0 ...x-a-missing-space-in-example-configs.patch | 0 ...c-host-modules-get-included-properly.patch | 0 dracut.changes | 14 ++- dracut.spec | 10 +- 6 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 0585-emergency-mode-use-sulogin.patch rename 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch => 0586-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch (100%) rename 0586-Fix-a-missing-space-in-example-configs.patch => 0587-Fix-a-missing-space-in-example-configs.patch (100%) rename 0587-Ensure-mmc-host-modules-get-included-properly.patch => 0588-Ensure-mmc-host-modules-get-included-properly.patch (100%) diff --git a/0585-emergency-mode-use-sulogin.patch b/0585-emergency-mode-use-sulogin.patch new file mode 100644 index 0000000..0d36450 --- /dev/null +++ b/0585-emergency-mode-use-sulogin.patch @@ -0,0 +1,96 @@ +From 97ce7a8179dfebe16d072d8d7355af3817512d0d Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Wed, 5 Dec 2018 16:52:45 +0100 +Subject: [PATCH] emergency mode: use sulogin + +- allow emergency login on every console + specified in the kernel cmdline +- require password for hostonly images +- emergency mode: Manually multiplex emergency infos + +This will bring all vital information to all ttys specified +as console devices, regardless of wether they hold the C flag. + +Reference: FATE#325386 +Reference: #449 +--- + modules.d/98dracut-systemd/dracut-emergency.sh | 29 +++++++++++++++----------- + modules.d/98dracut-systemd/module-setup.sh | 2 ++ + modules.d/99base/module-setup.sh | 8 +++++-- + 3 files changed, 25 insertions(+), 14 deletions(-) + +Index: dracut-044/modules.d/98dracut-systemd/dracut-emergency.sh +=================================================================== +--- dracut-044.orig/modules.d/98dracut-systemd/dracut-emergency.sh ++++ dracut-044/modules.d/98dracut-systemd/dracut-emergency.sh +@@ -17,20 +17,26 @@ source_hook "$hook" + + if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then + FSTXT="/usr/share/fsck/fsck_help_$fstype.txt" ++ RDSOSREPORT="$(rdsosreport)" + echo +- rdsosreport +- echo +- echo +- echo 'Entering emergency mode. Exit the shell to continue.' +- echo 'Type "journalctl" to view system logs.' +- echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot' +- echo 'after mounting them and attach it to a bug report.' +- echo +- echo +- [ -f $FSTXT ] && cat $FSTXT ++ while read _tty rest; do ++ ( ++ echo ++ echo $RDSOSREPORT ++ echo ++ echo ++ echo 'Entering emergency mode. Exit the shell to continue.' ++ echo 'Type "journalctl" to view system logs.' ++ echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot' ++ echo 'after mounting them and attach it to a bug report.' ++ echo ++ echo ++ [ -f "$FSTXT" ] && cat "$FSTXT" ++ ) > /dev/$_tty ++ done < /dev/consoles + [ -f /etc/profile ] && . /etc/profile + [ -z "$PS1" ] && export PS1="$_name:\${PWD}# " +- exec sh -i -l ++ exec sulogin -e + else + warn "$action has failed. To debug this issue add \"rd.shell rd.debug\" to the kernel command line." + exit 1 +Index: dracut-044/modules.d/98dracut-systemd/module-setup.sh +=================================================================== +--- dracut-044.orig/modules.d/98dracut-systemd/module-setup.sh ++++ dracut-044/modules.d/98dracut-systemd/module-setup.sh +@@ -59,5 +59,7 @@ install() { + done + + inst_simple "$moddir/dracut-tmpfiles.conf" "$tmpfilesdir/dracut-tmpfiles.conf" ++ ++ inst_multiple sulogin + } + +Index: dracut-044/modules.d/99base/module-setup.sh +=================================================================== +--- dracut-044.orig/modules.d/99base/module-setup.sh ++++ dracut-044/modules.d/99base/module-setup.sh +@@ -26,9 +26,13 @@ install() { + (ln -s bash "${initdir}/bin/sh" || :) + fi + +- #add common users in /etc/passwd, it will be used by nfs/ssh currently +- egrep '^root:' "$initdir/etc/passwd" 2>/dev/null || echo 'root:x:0:0::/root:/bin/sh' >> "$initdir/etc/passwd" +- egrep '^nobody:' /etc/passwd >> "$initdir/etc/passwd" ++ # add common users in /etc/passwd, it will be used by nfs/ssh currently ++ # use password for hostonly images to facilitate secure sulogin in emergency console ++ [[ $hostonly ]] && pwshadow='x' ++ grep '^root:' "$initdir/etc/passwd" 2>/dev/null || echo "root:$pwshadow:0:0::/root:/bin/sh" >> "$initdir/etc/passwd" ++ grep '^nobody:' /etc/passwd >> "$initdir/etc/passwd" ++ ++ [[ $hostonly ]] && grep '^root:' /etc/shadow >> "$initdir/etc/shadow" + + # install our scripts and hooks + inst_script "$moddir/init.sh" "/init" diff --git a/0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch b/0586-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch similarity index 100% rename from 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch rename to 0586-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch diff --git a/0586-Fix-a-missing-space-in-example-configs.patch b/0587-Fix-a-missing-space-in-example-configs.patch similarity index 100% rename from 0586-Fix-a-missing-space-in-example-configs.patch rename to 0587-Fix-a-missing-space-in-example-configs.patch diff --git a/0587-Ensure-mmc-host-modules-get-included-properly.patch b/0588-Ensure-mmc-host-modules-get-included-properly.patch similarity index 100% rename from 0587-Ensure-mmc-host-modules-get-included-properly.patch rename to 0588-Ensure-mmc-host-modules-get-included-properly.patch diff --git a/dracut.changes b/dracut.changes index b5c2707..f3c9f5f 100644 --- a/dracut.changes +++ b/dracut.changes @@ -2,19 +2,19 @@ Mon Jan 21 14:01:20 UTC 2019 - Daniel Molkentin - Ensure mmc host modules get included properly (bsc#1119037) - * adds 0587-Ensure-mmc-host-modules-get-included-properly.patch + * adds 0588-Ensure-mmc-host-modules-get-included-properly.patch ------------------------------------------------------------------- Sun Jan 20 21:11:06 UTC 2019 - Daniel Molkentin - Fix a missing space in example configs (boo#1121251) - * adds 0586-Fix-a-missing-space-in-example-configs.patch + * adds 0587-Fix-a-missing-space-in-example-configs.patch ------------------------------------------------------------------- Fri Dec 21 11:02:32 UTC 2018 - Michal Suchanek - 95zfcp_rules/parse-zfcp.sh: remove rule existence check (bsc#1008352). - * adds 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch + * adds 0586-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch ------------------------------------------------------------------- Mon Dec 17 15:27:15 UTC 2018 - jdelvare@suse.com @@ -32,6 +32,14 @@ Mon Dec 17 15:27:15 UTC 2018 - jdelvare@suse.com backup files are not needed in the first place. Get rid of them to simplify and speed up the whole process. +------------------------------------------------------------------- +Fri Dec 7 09:56:45 UTC 2018 - Daniel Molkentin + +- emergency mode: bring shell and all vital information to + all ttys specified as console devices + (FATE#325386, bsc#1053248, bsc#937555) + * Adds 0585-emergency-mode-use-sulogin.patch + ------------------------------------------------------------------- Wed Oct 31 09:57:55 UTC 2018 - Daniel Molkentin diff --git a/dracut.spec b/dracut.spec index 65a945c..4fd6ec4 100644 --- a/dracut.spec +++ b/dracut.spec @@ -413,12 +413,15 @@ Patch582: 0582-98dracut-systemd-Start-systemd-vconsole-setup-before.patch Patch583: 0583-99base-Allow-files-with-backslashes-in-hostonly-file.patch # Patch adopted from upstream commit b38b7fef36333a59890233dccfbbb6d2c40ebe83 Patch584: 0584-95dasd_rules-mark-dasd-rules-host_only.patch +# Patch adopted from upstream commit 32f68c1f9ac3720e8ce4b95a09c0ce680d5da786 +Patch585: 0585-emergency-mode-use-sulogin.patch # Patch adopted from git commit 69198cba654cb81093e36cca242481d26bec4b40 -Patch585: 0585-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch +Patch586: 0586-95zfcp_rules-parse-zfcp.sh-remove-rule-existence-check.patch # Patch adopted from upstream commit 58e0d2d5b5b3a5e7d6dbf74baa2f08f041de5a81 -Patch586: 0586-Fix-a-missing-space-in-example-configs.patch +Patch587: 0587-Fix-a-missing-space-in-example-configs.patch # Fix for 0562-Adjust-driver-list-to-modern-kernels.patch -Patch587: 0587-Ensure-mmc-host-modules-get-included-properly.patch +Patch588: 0588-Ensure-mmc-host-modules-get-included-properly.patch + BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -723,6 +726,7 @@ chmod a+x modules.d/95qeth_rules/module-setup.sh %patch585 -p1 %patch586 -p1 %patch587 -p1 +%patch588 -p1 %build %configure\ From b7a611d1d4400bb57a4dc0c72d99194815de43bf80eec94903c8bffd487e6bb5 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 25 Jan 2019 16:45:21 +0000 Subject: [PATCH 5/5] Accepting request 668711 from home:dmolkentin:branches:Base:System - Remove invalid "FONT_MAP=none" from vconsole.conf (osc#1013573) OBS-URL: https://build.opensuse.org/request/show/668711 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=362 --- dracut.changes | 5 +++++ dracut.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dracut.changes b/dracut.changes index f3c9f5f..4fa83e2 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 25 16:03:09 UTC 2019 - Daniel Molkentin + +- Remove invalid "FONT_MAP=none" from vconsole.conf (osc#1013573) + ------------------------------------------------------------------- Mon Jan 21 14:01:20 UTC 2019 - Daniel Molkentin diff --git a/dracut.spec b/dracut.spec index 4fd6ec4..fd177d5 100644 --- a/dracut.spec +++ b/dracut.spec @@ -802,6 +802,10 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %post %service_add_post purge-kernels.service %{?regenerate_initrd_post} +# Due to a bug in YaST and subsequent work by the migration script, /etc/vconsole.conf +# may contain "FONT_MAP=none" which is invalid. While systemd will silently ignore this, +# dracut will complain. Eliminate the entry (bsc#1096771, bsc#1013573). +sed -i '/^FONT_MAP=none/d' %{_sysconfdir}/vconsole.conf || : %post fips %{?regenerate_initrd_post}