Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2019-02-08 13:46:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Fri Feb 8 13:46:46 2019 rev:132 rq:672496 version:044.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2019-01-29 14:45:42.955019281 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new.28833/dracut.changes 2019-02-08 13:46:46.530809626 +0100 @@ -1,0 +2,15 @@ +Thu Feb 7 15:23:19 UTC 2019 - Daniel Molkentin <[email protected]> + +- 91zipl: Don't use contents of commented lines (osc#1119499) + * adds 0591-91zipl-Don-t-use-contents-of-commented-lines.patch + +------------------------------------------------------------------- +Mon Feb 4 16:12:16 UTC 2019 - Daniel Molkentin <[email protected]> + +- Fix displaying text on emergency consoles (boo#1124088) + - adds 0589-Fix-displaying-text-on-emergency-consoles.patch + +- Fix systemd version check, will be required for systemd v241 + - 0590-00systemd-check-if-systemd-version-is-a-number.patch + +------------------------------------------------------------------- New: ---- 0589-Fix-displaying-text-on-emergency-consoles.patch 0590-00systemd-check-if-systemd-version-is-a-number.patch 0591-91zipl-Don-t-use-contents-of-commented-lines.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.ZJwu36/_old 2019-02-08 13:46:50.310808453 +0100 +++ /var/tmp/diff_new_pack.ZJwu36/_new 2019-02-08 13:46:50.354808440 +0100 @@ -421,6 +421,12 @@ Patch587: 0587-Fix-a-missing-space-in-example-configs.patch # Fix for 0562-Adjust-driver-list-to-modern-kernels.patch Patch588: 0588-Ensure-mmc-host-modules-get-included-properly.patch +# Patch submitted to upstream +Patch589: 0589-Fix-displaying-text-on-emergency-consoles.patch +# Patch adopted from upstream commit 53cb081b4c3afa843022d8e6156bdbd4808db4a2 +Patch590: 0590-00systemd-check-if-systemd-version-is-a-number.patch +# Patch adopted from upstream commit 38ccf7c8e5e19b1e7ef400ff0a77eb92531754c0 +Patch591: 0591-91zipl-Don-t-use-contents-of-commented-lines.patch BuildRequires: asciidoc BuildRequires: bash @@ -727,6 +733,9 @@ %patch586 -p1 %patch587 -p1 %patch588 -p1 +%patch589 -p1 +%patch590 -p1 +%patch591 -p1 %build %configure\ ++++++ 0589-Fix-displaying-text-on-emergency-consoles.patch ++++++ >From 71ac8784994c2703ec4313821b3a314326255b65 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin <[email protected]> Date: Mon, 4 Feb 2019 14:43:04 +0100 Subject: [PATCH] Fix displaying text on emergency consoles Reference: boo#1124088 --- modules.d/98dracut-systemd/dracut-emergency.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98dracut-systemd/dracut-emergency.sh b/modules.d/98dracut-systemd/dracut-emergency.sh index 1a11220b..b9156d2f 100755 --- a/modules.d/98dracut-systemd/dracut-emergency.sh +++ b/modules.d/98dracut-systemd/dracut-emergency.sh @@ -31,7 +31,7 @@ if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then echo [ -f "$FSTXT" ] && cat "$FSTXT" ) > /dev/$_tty - done < /dev/consoles + done < /dev/console [ -f /etc/profile ] && . /etc/profile [ -z "$PS1" ] && export PS1="$_name:\${PWD}# " exec sulogin -e -- 2.16.4 ++++++ 0590-00systemd-check-if-systemd-version-is-a-number.patch ++++++ >From 53cb081b4c3afa843022d8e6156bdbd4808db4a2 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal <[email protected]> Date: Fri, 4 Jan 2019 16:51:15 +0100 Subject: [PATCH] 00systemd: check if systemd version is a number The recent systemd upstream introduced a slightly modified version string which included information about a git commit, which however broke the version check in dracut. Unfortunately, the (( )) bash syntax went along with it in certain cases and introduced a pretty nasty issue, when the systemd would boot up but with slightly changed environment. To prevent this from happening in the future, let's at least check if the version parsed from the `systemd --version` output is a comparable number. --- modules.d/00systemd/module-setup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh index 1ed4b34f..3583062b 100755 --- a/modules.d/00systemd/module-setup.sh +++ b/modules.d/00systemd/module-setup.sh @@ -5,6 +5,11 @@ check() { [[ $mount_needs ]] && return 1 if require_binaries $systemdutildir/systemd; then SYSTEMD_VERSION=$($systemdutildir/systemd --version | { read a b a; echo $b; }) + # Check if the systemd version is a valid number + if ! [[ $SYSTEMD_VERSION =~ ^[0-9]+$ ]]; then + dfatal "systemd version is not a number ($SYSTEMD_VERSION)" + exit 1 + fi (( $SYSTEMD_VERSION >= 198 )) && return 0 return 255 fi -- 2.16.4 ++++++ 0591-91zipl-Don-t-use-contents-of-commented-lines.patch ++++++ >From 38ccf7c8e5e19b1e7ef400ff0a77eb92531754c0 Mon Sep 17 00:00:00 2001 From: Thomas Abraham <[email protected]> Date: Wed, 19 Dec 2018 18:24:41 -0500 Subject: [PATCH] 91zipl: Don't use contents of commented lines Comment lines should be ignored. They should not be used for determining the /boot/zipl device --- modules.d/91zipl/module-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh index d0cd75da..2f95fd55 100755 --- a/modules.d/91zipl/module-setup.sh +++ b/modules.d/91zipl/module-setup.sh @@ -22,7 +22,7 @@ depends() { installkernel() { local _boot_zipl - _boot_zipl=$(sed -n 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab) + _boot_zipl=$(sed -n -e '/^[[:space:]]*#/d' -e 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab) if [ -n "$_boot_zipl" ] ; then eval $(blkid -s TYPE -o udev ${_boot_zipl}) if [ -n "$ID_FS_TYPE" ] ; then @@ -40,7 +40,7 @@ installkernel() { cmdline() { local _boot_zipl - _boot_zipl=$(sed -n 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab) + _boot_zipl=$(sed -n -e '/^[[:space:]]*#/d' -e 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab) if [ -n "$_boot_zipl" ] ; then echo "rd.zipl=${_boot_zipl}" fi -- 2.16.4
