commit: c9943a36849687a41b3feec6d6a7de5dddd715da Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Fri Mar 23 14:45:25 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Mar 24 18:02:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9943a36
sys-kernel/dracut: add upstream patches Fixes the following issues: - issues found by shellcheck - broken plymouth directory detection Closes: https://bugs.gentoo.org/651132 .../{dracut-047.ebuild => dracut-047-r1.ebuild} | 2 + .../047-all-fix-issues-found-by-shellcheck.patch | 77 ++++++++++++++++++++++ ...mouth-fix-detection-of-plymouth-directory.patch | 31 +++++++++ 3 files changed, 110 insertions(+) diff --git a/sys-kernel/dracut/dracut-047.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild similarity index 97% rename from sys-kernel/dracut/dracut-047.ebuild rename to sys-kernel/dracut/dracut-047-r1.ebuild index b37520c7e9f..0ced6bdb8d9 100644 --- a/sys-kernel/dracut/dracut-047.ebuild +++ b/sys-kernel/dracut/dracut-047-r1.ebuild @@ -52,6 +52,8 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}/045-systemdutildir.patch" + "${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch" + "${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch" ) src_configure() { diff --git a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch new file mode 100644 index 00000000000..d5cbe042b63 --- /dev/null +++ b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch @@ -0,0 +1,77 @@ +From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn <lnyk...@redhat.com> +Date: Fri, 2 Mar 2018 12:29:46 +0100 +Subject: [PATCH 06/14] all: fix issues found by shellcheck +To: <initra...@vger.kernel.org> + +Error: SHELLCHECK_WARNING: +/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157] + 937| dracut_kernel_post() { + 938| for _f in modules.builtin.bin modules.builtin modules.order; do + 939|-> [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" + 940| done + 941| + +Error: SHELLCHECK_WARNING: +/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078] + 16| elif [ -e /sbin/syslogd ]; then + 17| syslogtype="syslogd" + 18|-> elif [ /sbin/syslog-ng ]; then + 19| syslogtype="syslog-ng" + 20| else + +Error: SHELLCHECK_WARNING: +/usr/lib/dracut/modules.d/90crypt/crypt-lib.sh:15:29: error: Since you double quoted this, it will not word split, and the loop will only run once. [SC2066] + 13| strstr "$d" "${luks##luks-}" && return 0 + 14| if [ -n "$dev" ]; then + 15|-> for _dev in "$(devnames $d)"; do + 16| [ "$dev" -ef "$_dev" ] && return 0 + 17| done +--- + dracut-init.sh | 2 +- + modules.d/90crypt/crypt-lib.sh | 2 +- + modules.d/98syslog/parse-syslog-opts.sh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dracut-init.sh b/dracut-init.sh +index 53e6f13a..1278c638 100644 +--- a/dracut-init.sh ++++ b/dracut-init.sh +@@ -942,7 +942,7 @@ for_each_kmod_dep() { + + dracut_kernel_post() { + for _f in modules.builtin.bin modules.builtin modules.order; do +- [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" ++ [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" + done + + # generate module dependencies for the initrd +diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh +index 532b9a71..bbf485e0 100755 +--- a/modules.d/90crypt/crypt-lib.sh ++++ b/modules.d/90crypt/crypt-lib.sh +@@ -12,7 +12,7 @@ crypttab_contains() { + strstr "${l##luks-}" "${luks##luks-}" && return 0 + strstr "$d" "${luks##luks-}" && return 0 + if [ -n "$dev" ]; then +- for _dev in "$(devnames $d)"; do ++ for _dev in $(devnames $d); do + [ "$dev" -ef "$_dev" ] && return 0 + done + fi +diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh +index 50ec2759..9ec6ad47 100755 +--- a/modules.d/98syslog/parse-syslog-opts.sh ++++ b/modules.d/98syslog/parse-syslog-opts.sh +@@ -15,7 +15,7 @@ detect_syslog() { + syslogtype="rsyslogd" + elif [ -e /sbin/syslogd ]; then + syslogtype="syslogd" +- elif [ /sbin/syslog-ng ]; then ++ elif [ -e /sbin/syslog-ng ]; then + syslogtype="syslog-ng" + else + warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check." +-- +2.16.1 + diff --git a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch new file mode 100644 index 00000000000..42f877292a7 --- /dev/null +++ b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch @@ -0,0 +1,31 @@ +From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexan...@tsoy.me> +Date: Fri, 23 Mar 2018 11:52:27 +0300 +Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory +To: <initra...@vger.kernel.org> + +Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth +directorirs, so we should check the existance of plymouth-populate-initrd +script. + +Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae +--- + modules.d/50plymouth/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh +index 5fbca8b0..b51913e8 100755 +--- a/modules.d/50plymouth/module-setup.sh ++++ b/modules.d/50plymouth/module-setup.sh +@@ -6,7 +6,7 @@ pkglib_dir() { + _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" + fi + for _dir in $_dirs; do +- if [ -d $_dir ]; then ++ if [ -x $_dir/plymouth-populate-initrd ]; then + echo $_dir + return + fi +-- +2.16.1 +
