[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#928701: marked as done (unblock: dracut/048+80-2)



Your message dated Sat, 11 May 2019 13:33:00 +0000
with message-id <9f0fe521-47f3-5298-0733-432f91ad70f8@thykier.net>
and subject line Re: Bug#928701: unblock: dracut/048+80-2
has caused the Debian Bug report #928701,
regarding unblock: dracut/048+80-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
928701: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928701
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package dracut 048+80-2

It contains two important bug fixes. This is the debdiff between
048+80-1 and 048+80-2

diff -Nru dracut-048+80/debian/changelog dracut-048+80/debian/changelog
--- dracut-048+80/debian/changelog	2018-08-24 14:29:22.000000000 +0200
+++ dracut-048+80/debian/changelog	2019-05-07 13:11:11.000000000 +0200
@@ -1,3 +1,11 @@
+dracut (048+80-2) unstable; urgency=medium
+
+  * fix bashism in several scripts, Closes: #772260
+  * add patch to workaround changes in bash-5 while fsck'ing,
+    Closes: #920563
+
+ -- Thomas Lange <lange@debian.org>  Tue, 07 May 2019 13:11:11 +0200
+
 dracut (048+80-1) unstable; urgency=low
 
   * new upstream
diff -Nru dracut-048+80/debian/patches/bash5-fix dracut-048+80/debian/patches/bash5-fix
--- dracut-048+80/debian/patches/bash5-fix	1970-01-01 01:00:00.000000000 +0100
+++ dracut-048+80/debian/patches/bash5-fix	2019-05-07 12:17:52.000000000 +0200
@@ -0,0 +1,55 @@
+--- a/modules.d/99fs-lib/fs-lib.sh
++++ b/modules.d/99fs-lib/fs-lib.sh
+@@ -44,22 +44,22 @@
+             ;;
+         ext?)
+             type e2fsck >/dev/null 2>&1 &&
+-            _drv="_drv=e2fsck fsck_drv_com" &&
++            _drv="_drv=e2fsck fsck_drv_com e2fsck" &&
+             return 0
+             ;;
+         f2fs)
+ 	    type fsck.f2fs >/dev/null 2>&1 &&
+-	    _drv="_drv=fsck.f2fs fsck_drv_com" &&
++	    _drv="_drv=fsck.f2fs fsck_drv_com fsck.f2fs" &&
+ 	    return 0
+ 	    ;;
+         jfs)
+             type jfs_fsck >/dev/null 2>&1 &&
+-            _drv="_drv=jfs_fsck fsck_drv_com" &&
++            _drv="_drv=jfs_fsck fsck_drv_com jfs_fsck" &&
+             return 0
+             ;;
+         reiserfs)
+             type reiserfsck >/dev/null 2>&1 &&
+-            _drv="_drv=reiserfsck fsck_drv_com" &&
++            _drv="_drv=reiserfsck fsck_drv_com reiserfsck" &&
+             return 0
+             ;;
+         btrfs)
+@@ -75,7 +75,7 @@
+             ;;
+         *)
+             type fsck >/dev/null 2>&1 &&
+-            _drv="_drv=fsck fsck_drv_std" &&
++            _drv="_drv=fsck fsck_drv_std fsck" &&
+             return 0
+             ;;
+     esac
+@@ -99,6 +99,7 @@
+ fsck_drv_com() {
+     local _ret
+     local _out
++    local _drv=$1
+ 
+     if ! strglobin "$_fop" "-[ynap]"; then
+         _fop="-a ${_fop}"
+@@ -177,7 +178,7 @@
+     _out="$(fsck -M -T "$@" -- -a)"
+     _ret=$?
+ 
+-    fsck_tail
++    _drv=$_drv fsck_tail
+ 
+     return $_ret
+ }
diff -Nru dracut-048+80/debian/patches/fix-bashism dracut-048+80/debian/patches/fix-bashism
--- dracut-048+80/debian/patches/fix-bashism	1970-01-01 01:00:00.000000000 +0100
+++ dracut-048+80/debian/patches/fix-bashism	2019-05-07 12:24:14.000000000 +0200
@@ -0,0 +1,55 @@
+--- a/modules.d/90crypt/crypt-lib.sh
++++ b/modules.d/90crypt/crypt-lib.sh
+@@ -191,7 +191,7 @@
+     local device="$3"
+ 
+     # No mounting needed if the keyfile resides inside the initrd
+-    if [ "/" == "$keydev" ]; then
++    if [ "/" = "$keydev" ]; then
+         local mntp=/
+     else
+         # This creates a unique single mountpoint for *, or several for explicitly
+--- a/modules.d/90crypt/parse-keydev.sh
++++ b/modules.d/90crypt/parse-keydev.sh
+@@ -18,7 +18,7 @@
+         fi
+ 
+         # A keydev of '/' is treated as the initrd itself
+-        if [ "/" == "$keydev" ]; then
++        if [ "/" = "$keydev" ]; then
+             [ -z "$luksdev" ] && luksdev='*'
+             echo "$luksdev:$keydev:$keypath" >> /tmp/luks.keys
+             continue
+--- a/modules.d/91crypt-gpg/crypt-gpg-lib.sh
++++ b/modules.d/91crypt-gpg/crypt-gpg-lib.sh
+@@ -53,7 +53,7 @@
+         --tries 3 --tty-echo-off
+ 
+     # Clean up the smartcard gpg-agent
+-    if [ "${useSmartcard}" == "1" ]; then
++    if [ "${useSmartcard}" = "1" ]; then
+         GNUPGHOME="$gpghome" gpg-connect-agent 1>/dev/null killagent /bye
+     fi
+ 
+--- a/modules.d/95dcssblk/parse-dcssblk.sh
++++ b/modules.d/95dcssblk/parse-dcssblk.sh
+@@ -2,7 +2,7 @@
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+ dcssblk_arg=$(getarg rd.dcssblk=)
+-if [ $? == 0 ];then
++if [ $? = 0 ];then
+ 	info "Loading dcssblk segments=$dcssblk_arg"
+ 	modprobe dcssblk segments=$dcssblk_arg
+ fi
+--- a/modules.d/98syslog/rsyslogd-start.sh
++++ b/modules.d/98syslog/rsyslogd-start.sh
+@@ -38,7 +38,7 @@
+ [ -f /tmp/syslog.conf ] && read conf < /tmp/syslog.conf
+ [ -z "$conf" ] && conf="/etc/rsyslog.conf" && echo "$conf" > /tmp/syslog.conf
+ 
+-if [ $type == "rsyslogd" ]; then
++if [ $type = "rsyslogd" ]; then
+     template=/etc/templates/rsyslog.conf
+     if [ -n "$server" ]; then
+         rsyslog_config "$server" "$template" "$filters" > $conf
diff -Nru dracut-048+80/debian/patches/series dracut-048+80/debian/patches/series
--- dracut-048+80/debian/patches/series	2018-08-24 13:14:53.000000000 +0200
+++ dracut-048+80/debian/patches/series	2019-05-07 12:20:14.000000000 +0200
@@ -1,3 +1,5 @@
+fix-bashism
+bash5-fix
 crc32c
 systemd-udev
 plymouth

-- 
regards Thomas

--- End Message ---
--- Begin Message ---
Thomas Lange:
> 
> Package: release.debian.org
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> Severity: normal
> 
> Please unblock package dracut 048+80-2
> 
> It contains two important bug fixes. This is the debdiff between
> 048+80-1 and 048+80-2
> 
> [...]
> 

Unblocked, thanks.
~Niels

--- End Message ---

Reply to: