From 6bd95d1f6320b8666a31ec949183aaa3088aa16f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Mar 2018 19:22:13 +0100 Subject: gentoo resync : 25.03.2018 --- sys-kernel/dracut/Manifest | 6 +- sys-kernel/dracut/dracut-047-r1.ebuild | 156 +++++++++++++++++++++ sys-kernel/dracut/dracut-047.ebuild | 151 -------------------- sys-kernel/dracut/dracut-9999.ebuild | 5 +- .../047-all-fix-issues-found-by-shellcheck.patch | 77 ++++++++++ ...mouth-fix-detection-of-plymouth-directory.patch | 31 ++++ 6 files changed, 272 insertions(+), 154 deletions(-) create mode 100644 sys-kernel/dracut/dracut-047-r1.ebuild delete mode 100644 sys-kernel/dracut/dracut-047.ebuild create mode 100644 sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch create mode 100644 sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch (limited to 'sys-kernel/dracut') diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index b76f491be07f..d7900b8a9d39 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -3,6 +3,8 @@ AUX 044-0002-systemd-initrd-add-initrd-root-device.target.patch 924 BLAKE2B eeeb AUX 044-0003-50-dracut.install-use-bin-bash-shebang.patch 558 BLAKE2B 7a5c30a6a70b4dba8463c4701910dd9878f6923a572532b022cfd0c63e9f3f01559d5c2e5c419f8e3b7196d3e2c587279e16761e60e8e67d8fc8ab5d35c96cdf SHA512 657685b27d3ffd326fd1976ccd89cbe4ab9122b63f2a6a03cae3bd54663bd1a26366552550ea50af671aa5a604b9ca08caf1bc689551e46f7d208c7d5e83730b AUX 045-systemdutildir.patch 1665 BLAKE2B ddca173403586e0ec4f8af86bf9d8004a0fa6176155c8b9d3e7906fdbf23db910290d60cf1834da7635c75b58b107616a722b560b076608920f9cc4b3a6351ff SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b AUX 046-amd-microcode.patch 1013 BLAKE2B be9f9b545e5d68285f2b4e3a4ccee3e39c0c41349450053e411532c47e9634157df190ea2bceacb422a3f1b874ae256c34a4822f3fb964b8c06a05f7adec3a59 SHA512 c37734a66a9727cb0effc5a02b85e6bd2d3e5b05913657f517fcb26fc6cacc89398e28dd2865e5abe0148520bc95530a6cffb904b5dbde00af1d85e7d1c26b65 +AUX 047-all-fix-issues-found-by-shellcheck.patch 3265 BLAKE2B 0f7e227311c96ca204d5b23093003b38c120dfe208482e421f7104fdfb29beb925239e007d372ba1e7b9e75ad395f2a4b59a5a0dbed02389398f678f480fb45b SHA512 21fbcb0558a543402325f3b356d08ce4747c82e337a3f196a1ded20b633bcf79ab14323858386a5c35ef4857f8795f14b0df874596ecb1a4f8aed90160405dc8 +AUX 047-plymouth-fix-detection-of-plymouth-directory.patch 1055 BLAKE2B 285e008dcbada06a475f1cbfe67602f046c7bb354b812ea614d99a921d40d09d099f3329cbc348b8bc4dd17bbbdcc0da986f0de5cce7f07464d2318dd9f0d719 SHA512 90372cd630903981528acd6aec1f1051e94ca2a0e53a834583faf6bf244aa7967f590f9bc38db3233e78bfd859388c011484a624d7f092c863755f73d6285b21 AUX dracut-044-bash-4.4.patch 5036 BLAKE2B faf944f4405b560d7f43ce2fd0595b223f1c91eed11422b19a5b61b710e69c10b855d3fb99fd28f204d8c31c49c272259704e148fcb794bbd8309b3779a62b4f SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279 AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5e5eb2f8c9d971f5bd2bdc8b8a49399d836efc8efed2547118399ae7780c93014659d88c0359e7336f2e2a345ce009b5f872468d0412aaf9 SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02 DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d @@ -13,6 +15,6 @@ EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd6638853 EBUILD dracut-044-r3.ebuild 6946 BLAKE2B 0d8d4af31cee443564192cb02ef4b620f33a5388ada4c5359dd21c6e21abd2beebf194b7d5890c6f96016e15928118b88603e56bf4a81fe82ce09f5d33534bf5 SHA512 65f4f7193a6eb32c81cf57ac8d37c7a82ad2fe0bb580f5dc65c168b02a41f4cea29b81f6432f760bf59decdde501800d7a573dd6a5c021834896e911035f5ebd EBUILD dracut-045-r2.ebuild 4798 BLAKE2B 9ea482401d66d49eadca291a2fea9a7238d052f304cc6af83f509a92369383109d99d43a8a8caee258bd9d9fbadb23a2e6822314c95db26194567ab2f78cfd8c SHA512 3cd182bff67a90bc94e7b289ce1f09532dbe3784f93e798e7d5362418cc43d42c26277d4c4e13abcb389058b76629ad0babfe3b7a7176390358bf148167c2c26 EBUILD dracut-046-r1.ebuild 4807 BLAKE2B f31663293ad74ca0ac058a43edac505a8f7bea5af6677535a6425588de39bbd2a0750085e0c290af234de075d05cb9c71f43587490f7090724140856361e424b SHA512 b6c93ec687c3d005ba7e2b0f5ad1317f343edc20c527b68927b00c6c64c29c74fdcb6db0b4a738e22de94141bae43e5aef37aaf1625667f8824dd8dbc5691748 -EBUILD dracut-047.ebuild 4584 BLAKE2B ad45aa14e8e521d4a88450f239c8666564d88876fe632d8b4678750209a47c3b54aca1ca93ecde2cde6bb6b4dd5cfcf814665a8bf643a38a14ddd519d97e5684 SHA512 57e1617da82ba2549c3d61661f1a2eb7bb3eccd0841a8f91c4eb23a39daee39de8b9abb2b35e33a31f3a9dfd93a4bcf9e52171bfcc9bb69c0e9b9e2dc4793789 -EBUILD dracut-9999.ebuild 4719 BLAKE2B 3c7f5ed4e95f956ed2f92d1d1553439d74aed8098c7936b3ced73f0eea680aa14915bd99952ab1a7d2fe7f30f205422c51911bd9cf158c6ab57cf223adcbfab5 SHA512 cefc18a54e7e9ce56bda7c2f25a5ef592d3086ed9975e06f603f00721fe2af086eef83bfa377038ae34b646d7bb2b26475ba5d76b312fe8ffd70eabab64280ef +EBUILD dracut-047-r1.ebuild 4736 BLAKE2B 6940ade45fdac58fabaf6f814037ca704e77f01872163da3e4dc96572051961ca92a1e467dfe0541e40c920988400fbaa37e2a62a1e7edda31d99564d4c3b5b9 SHA512 4f39489389f78dc8aab806156821e6bd95a276f117c5d1711a8fe4498a94d83590cdab10d533bfc0bf5e6e0b66de46c349aa827f244ca86101aa67aad9ba2756 +EBUILD dracut-9999.ebuild 4741 BLAKE2B 32973c0e3706bc6d46aaa8ffa9ea24da1098454bbbb03fe68b9b34637a59fdcac5a20bc334f1b12c066972f3c53780328ba89de576ffa46e2c3ac074582d301a SHA512 70e4e0e9a3b95290eeba46c7d3cdfa63b9af08c96522a697bc4efe9ed041232841142947d13bcc3a64e08a8a802e9cd8399a64b1297f501bf43dc41b9e99636f MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild new file mode 100644 index 000000000000..d663ce2a26f6 --- /dev/null +++ b/sys-kernel/dracut/dracut-047-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://dracut.wiki.kernel.org" +SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug selinux" + +# Tests need root privileges, bug #298014 +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/kmod-23[tools] + virtual/pkgconfig + virtual/udev + " +RDEPEND="${COMMON_DEPEND} + app-arch/cpio + >=app-shells/bash-4.0:0 + sys-apps/coreutils[xattr(-)] + || ( + >=sys-apps/sysvinit-2.87-r3 + sys-apps/systemd[sysv-utils] + ) + >=sys-apps/util-linux-2.21 + + debug? ( dev-util/strace ) + selinux? ( + sec-policy/selinux-dracut + sys-libs/libselinux + sys-libs/libsepol + ) + " +DEPEND="${COMMON_DEPEND} + app-text/asciidoc + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + >=dev-libs/libxslt-1.1.26 + " + +DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules + README.testsuite TODO ) + +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() { + local myconf=( + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --bashcompletiondir="$(get_bashcompdir)" + --systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + tc-export CC PKG_CONFIG + + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die +} + +src_install() { + default + + local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) + if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then + # Preserve lib -> lib64 symlinks in initramfs + libdirs+=( /lib /usr/lib ) + fi + + einfo "Setting libdirs to \"${libdirs[*]}\" ..." + echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die + insinto "/usr/lib/dracut/dracut.conf.d" + doins "${T}/gentoo.conf" + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + docinto html + dodoc dracut.html +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_exists; then + ewarn "" + ewarn "If the following test report contains a missing kernel" + ewarn "configuration option, you should reconfigure and rebuild your" + ewarn "kernel before booting image generated with this Dracut version." + ewarn "" + + local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" + + # Kernel configuration options descriptions: + local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' + ERROR_DEVTMPFS+='is missing and REQUIRED' + local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' + ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' + + check_extra_config + echo + else + ewarn "" + ewarn "Your kernel configuration couldn't be checked." + ewarn "Please check manually if following options are enabled:" + ewarn "" + ewarn " CONFIG_BLK_DEV_INITRD" + ewarn " CONFIG_DEVTMPFS" + ewarn "" + fi + + elog "To get additional features, a number of optional runtime" + elog "dependencies may be installed:" + elog "" + optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ + sys-apps/iproute2 "net-misc/iputils[arping]" + optfeature \ + "Measure performance of the boot process for later visualisation" \ + app-benchmarks/bootchart2 app-admin/killproc sys-process/acct + optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs + optfeature "Load kernel modules and drop this privilege for real init" \ + sys-libs/libcap + optfeature "Support CIFS" net-fs/cifs-utils + optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ + "sys-fs/cryptsetup[-static-libs]" + optfeature "Support for GPG-encrypted keys for crypt module" \ + app-crypt/gnupg + optfeature \ + "Allows use of dash instead of default bash (on your own risk)" \ + app-shells/dash + optfeature "Framebuffer splash (media-gfx/splashutils)" \ + media-gfx/splashutils + optfeature "Support iSCSI" sys-block/open-iscsi + optfeature "Support Logical Volume Manager" sys-fs/lvm2 + optfeature "Support MD devices, also known as software RAID devices" \ + sys-fs/mdadm + optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools + optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' + optfeature "Support network block devices" sys-block/nbd + optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind + optfeature \ + "Install ssh and scp along with config files and specified keys" \ + net-misc/openssh + optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ + app-admin/rsyslog +} diff --git a/sys-kernel/dracut/dracut-047.ebuild b/sys-kernel/dracut/dracut-047.ebuild deleted file mode 100644 index b37520c7e9fc..000000000000 --- a/sys-kernel/dracut/dracut-047.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/kmod-23[tools] - virtual/pkgconfig - virtual/udev - " -RDEPEND="${COMMON_DEPEND} - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) - " -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO dracut.html ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}/045-systemdutildir.patch" -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die -} - -src_install() { - default - - local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) - if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then - # Preserve lib -> lib64 symlinks in initramfs - libdirs+=( /lib /usr/lib ) - fi - - einfo "Setting libdirs to \"${libdirs[*]}\" ..." - echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die - insinto "/usr/lib/dracut/dracut.conf.d" - doins "${T}/gentoo.conf" - - insinto /etc/logrotate.d - newins dracut.logrotate dracut -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs - optfeature "Load kernel modules and drop this privilege for real init" \ - sys-libs/libcap - optfeature "Support CIFS" net-fs/cifs-utils - optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ - "sys-fs/cryptsetup[-static-libs]" - optfeature "Support for GPG-encrypted keys for crypt module" \ - app-crypt/gnupg - optfeature \ - "Allows use of dash instead of default bash (on your own risk)" \ - app-shells/dash - optfeature "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools - optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' - optfeature "Support network block devices" sys-block/nbd - optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind - optfeature \ - "Install ssh and scp along with config files and specified keys" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 684ea423e895..791e382ac490 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -53,7 +53,7 @@ DEPEND="${COMMON_DEPEND} " DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO dracut.html ) + README.testsuite TODO ) QA_MULTILIB_PATHS="usr/lib/dracut/.*" @@ -91,6 +91,9 @@ src_install() { insinto /etc/logrotate.d newins dracut.logrotate dracut + + docinto html + dodoc dracut.html } pkg_postinst() { 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 000000000000..d5cbe042b639 --- /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 +Date: Fri, 2 Mar 2018 12:29:46 +0100 +Subject: [PATCH 06/14] all: fix issues found by shellcheck +To: + +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 000000000000..42f877292a79 --- /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 +Date: Fri, 23 Mar 2018 11:52:27 +0300 +Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory +To: + +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 + -- cgit v1.2.3