diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2014-05-14 07:09:50 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2014-05-14 07:09:50 +0000 |
commit | e4a2a29d5466af1fc469f0714ff1018c659f6aef (patch) | |
tree | db6bd64b53b2d77353720cc10c6712a2be79fb55 /sys-kernel | |
parent | Fixed patchname (diff) | |
download | historical-e4a2a29d5466af1fc469f0714ff1018c659f6aef.tar.gz historical-e4a2a29d5466af1fc469f0714ff1018c659f6aef.tar.bz2 historical-e4a2a29d5466af1fc469f0714ff1018c659f6aef.zip |
Fixes bug #506094 and rels bug #508652 in behalf of Alexander Tsoy.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/dracut/ChangeLog | 8 | ||||
-rw-r--r-- | sys-kernel/dracut/Manifest | 18 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-037-r1.ebuild | 264 | ||||
-rw-r--r-- | sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch | 26 |
4 files changed, 307 insertions, 9 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 51abfd99c181..dfd91ab60a8a 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.165 2014/04/24 20:09:28 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.166 2014/05/14 07:09:46 aidecoe Exp $ + +*dracut-037-r1 (13 May 2014) + + 13 May 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-037-r1.ebuild, + +files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch: + Fixes bug #506094 and rels bug #508652 in behalf of Alexander Tsoy. 24 Apr 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-036-r4.ebuild, dracut-037.ebuild: diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 62a2c808245d..bfdb379de3f4 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -26,23 +26,25 @@ AUX 037-0001-dracut-functions.sh-support-for-altern.patch 1485 SHA256 dda6a7a87f AUX 037-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 948 SHA256 b3bf73620278a99a3f416d60ce285da1052bee432c47dbbb9fdefd6b8831f454 SHA512 b2e864ec8a338b9bee65cb13c4d891f2e31b51d46a640ada597c30dce7cf80726f69b2cc4de58a94dad688a8ac9b153a146ef7ffbfb9c86aa038eb9efd36b8cf WHIRLPOOL 3eaf73c45ee33a9b673245e0ae4ef56042a8b77de916105ac77e55d78cb374a74fdf1006370caf6f2d7935ba717466a3de058af5986862080a1418b092f25eb2 AUX 037-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 9e23c100a0acde74f043a81b743aeda3e9a74cb154d6f298e23626bb7a80c967 SHA512 3104c377d519df9755600f33b1c8be872202cfbb95a76fdcc05e69fd9e04da617dff7e7e2ced11543e8a1ba138275897ab8d40923180c9d9b10d3bc52c86e138 WHIRLPOOL 7d0b9d68a5e50e3d98ffd0db4ee237de0d2f140ba0ecf03a822189964deaf28b6aa898ddb8cbe9ac22c91eb7ecaf65fc8346a6a6b5bed07725f12faea28da8ff AUX 037-0004-Install-dracut-install-into-libexec-di.patch 2581 SHA256 bb83cfecd54a18b630b9dd08cae8a36778f75fae0bc28faa6f484d2a4f687274 SHA512 ea2cba205179023f7a55405b5a8baf740e5495db4210f63c3be32ba333a2b0a633915f2cf51865f248c2142c290fcdd675f77ceca3247d66965d207d40e60a30 WHIRLPOOL 5d14552a0d62e5231c7983949d720064ba56a0a6a10e659e884b11e8719afba53dde36659e632d60816af1aad585d5adce946fafd7392e48d029149c0ea02f29 +AUX 037-0005-modsign-do-not-hardcode-path-to-keyctl.patch 784 SHA256 47184c81bd1ae0be7cee4829d1ef454478a7092ed8c1826dda2ca16445f19e8a SHA512 747cf9a092dfba948367086fb028b84444971f1e843f7b9bf99d592da726e78f3ab204604958c41e21fe38eda885ab52670c223402d18b62f933e72156df5822 WHIRLPOOL 70fb43941d47fb0e1c376374d9b27c4a8f29a823df0ab57e679ec04ea6da59d551c6a9d1a23b90c16dca7ba9c9f9232ce4db6466c0b911af8c25243621a9235f DIST 034-0010-module-setup.sh-add-comments.patch.bz2 6424 SHA256 fbcb940c83e362cc93a78c5be28ffd7c794a331f992498e451d69c1830f054fa SHA512 e5e41b8696716c5284ea981ae85dbe688c5c31330e400c79f4ba46890939dffdd7744e4a85d27d074987a8db65114332171af0a5471338e3e4bed19d54edc6fd WHIRLPOOL c5d29ef2f20aa752e57180be35a2014c214a25e4e49d3f623d05cd6ef1debd2cec38d24453ecb0c004cdbb52239f0d541ddc9df065ab84fb7d62c30594704347 DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13 DIST dracut-036.tar.xz 255192 SHA256 6dd97c4323ec8bd87b24a95349692fb6c6ca2d1b3528793ef117820049b6fcd3 SHA512 e55448701ef4b0c8969d4d64239a2a7df3d7b06f4457838d2b2139e58b754822654a1b8cfc7d6dbcd7a79dbc14e75366a39e21104b4aeda20c7bf34734668344 WHIRLPOOL ddbe88cb6b333586a71eeed98871066bc79208d2ba8d88dfb42245aca6bd15d6c0c436948569fc8c18703f9d66ad9918bb1e73e050ce6c807fae833148ead218 DIST dracut-037.tar.xz 256964 SHA256 9c4c365c8dabc19b66da2972bbed7b983df520481325b8a37d3f620218620d76 SHA512 db6d5b064bb24a0fe5a09b0fe8915247f6b3028c0182faa7a533624f98fce45f7ad449d1814ec79fc039ee82c1be0afc7ae8987fee7c5a7f8f16480a6a3b0f39 WHIRLPOOL d904b7d8cd1753df20630db1056853a17a020389ff4da8f14b5d2f207d76046911993eed3522a11fe7d78a5770d496430bbfaf4a3ac3fef83c54a817639094aa EBUILD dracut-034-r4.ebuild 10416 SHA256 79ce6e1d4d6a5ee546309b518e8b92446d3da60c13435929f70c8b54db816d69 SHA512 6a2903b1960dd486ef20c483f8ed8b4ca1430362ffabe07dfad6c2b854164ddc91daf0ba119c6011a432a6bb300fda708d09ca89328073d72bb625b405966cae WHIRLPOOL 077a09b1578a790762d8444ce1a6560f61a1acbcf1520c44ae139d04ae34f3322676178d51a2b9a1462868d3e0f1eea1254869f64810272951c90f4347d57cd9 EBUILD dracut-036-r4.ebuild 7723 SHA256 8a1165848519c870ed145b6554bc679fe1d9cb19a62df1111255b229246c2391 SHA512 97c0be10312ff68ebfce3f17dbfa02e5b3b4fcb51acdab6362e6329d2b93f60f87d81bb10f00377aa372d9b1b9783c705f8ce3187248a6e76571e143ed3c326d WHIRLPOOL 07044379e3a84318a672a8e7c84b4266bdc437030bdc7756726ea9260c6565f5b3159643ec488874adf530b7c8e2868b81691fafba49bbe79087936cdfa110fc +EBUILD dracut-037-r1.ebuild 7825 SHA256 56f2633532667404250adf69172601453e9e2a7d7ae55d96552c9f58be00bd0e SHA512 a41defdbae1a57dfe9271c8c5798dfe39451cf958b807ccdfca87bbaf96021f2619cef118ba4838f7e3e74166a6e278791d0daf99611cc69a25f6a12828b0950 WHIRLPOOL 83ea7a5343c8a3ba43b594a483b9692e9324316ccab06e7ac65b535f3d925f84685f34c7531982b893a9bc7981a18e6807edfeafb74203bb42df9f446fcf8e2e EBUILD dracut-037.ebuild 7661 SHA256 948aed0aab0ff9c9087d252f7676a6767f0f2b66d5fbae8a2624ddfba641afb7 SHA512 4d02206374fdd4848bc916133ff00b688c8632a22f5171f277ea8e13426fdc3ac91a27f1f1a81049ae118df41974e56fe82deffb89bb975b31b332899bf7bae2 WHIRLPOOL 189ce52267852f9369f3805247b82ec675df9ec0bb91de0e991e2ad5bcb2147364754bf25fbcdddeaf7d44b179b11bfe780d9846b70669306da1d60d5d3d6abf -MISC ChangeLog 70788 SHA256 922e48d16457bbe763805aeba50dc1e54fbefaaaadf9bf7a34cea1a43dd99bb1 SHA512 1fed2232d4875ff7e2ba122db771bc6e69dab12b391e07616dcfd6486a7a878bc8bc3c5ad12a34039e5a747d6c7b0fdd4eecf1c35c1c70a2051b8737cc350945 WHIRLPOOL e84621103608f2adc72f9db9addcc3dc72ce4b101ba27b9b706884ae343620446a8a20c8bb82a010485736d6690bb31d034c36636bf584fb003546f667d53e16 +MISC ChangeLog 71033 SHA256 920019c4e346eda076fc1e6c4374ab50b7a64e785cba35797803d1b998f7e262 SHA512 f5eaccbbe3be5a08b848058f83076827f23e68048fb311cc409c6d39eccc0c94872454879c533e3ae3f209914601022cb720fa185927f80f47335103f3e55b0f WHIRLPOOL 0f2e34a8b98560560646b8f977c966f4b45be5e6d47c6ed295dd116157dfb4d0ebf52af0d5202caec51e8508b8cb83108c34892c8f03299ef28ca63d90d88b53 MISC metadata.xml 906 SHA256 5f19b725d0669877fdd7814634b7aa7dd73331459bace52de02908417b833c3f SHA512 c5838d36080528d541b67cb38de17cc2351f7e5e17ab060c58f037792225ea223ade6b7e69376f4a9256b0bb3dcf4de578dcd50ee1c7d04a3f3288ca3c1ada43 WHIRLPOOL 532ea421fab965094820d5c0961a00ca38c858461f572a0cd4a145aa90340a569ee942062338ae03773c2709a08e4882f3176333aa5383b7e3c467cb01c0874d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJTWW95AAoJEPATRTHh2/q1NtEH/RF9Xuh/TJsLVXx4/3f2y+yT -Qj0sr3LrsLdBN52jtxFz+1+aei1AG22D8yo1OZofcPbstxV8BomtQl6C+KgS0imD -M5YHqF8BzH1kliP37wffdwe4uSv1fqXlQ3f1T0courJ8Bs2JPw5S7XTyl3eZVL/z -3lV+Te7t8p0xrHJtq5pWFX96c2I8RuYi5Ncx3O98799v+oQnrNO/WosVBEypcGjd -syuRnD2TARww5h7A5fMkto7so4dnJ8mMhAv0hBpMm1HstqH4hY/1rgOi8dXg9uS4 -v3NjSikDAaUdxDmXR4yzvsX96fglqIzuXw7+P41PA7f1RwoMtIMQ8TVNSUZrW0A= -=T/k2 +iQEcBAEBCAAGBQJTcxa7AAoJEPATRTHh2/q13UUH/R1pmepxRx0FdLuucHDoteFt +Fb+RQ/6MhdLwELvcOXdmtBMruX4VGnRkZjnz3oSdiu3Lywc73Vjv9zz3KofUW9Vr +sKOHIWzyFALbLk6/SPLTame2zau467RL9z2e9BIGt/3TFhwhbJHjboBaMtCB/MO+ +vADoBP3jZpxfg55RO362Sh6pggdmB+WTjXlRaB0ZqE2fDx1lGL7AMKs0oEa48snT +ZKfwPLSqRhVC6Jq0S9EN3yoS4z9tjCH6pq8VLqBFW9vEpdwAu92AYX+mhUxJ6L3E +7/UOi1XKnd4IapxkKW4Nc4tJecPMQp2fLmvSdlU7r3onu0Vn0vnvGBtNyHppehE= +=hh98 -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-037-r1.ebuild b/sys-kernel/dracut/dracut-037-r1.ebuild new file mode 100644 index 000000000000..07d2dc2e4424 --- /dev/null +++ b/sys-kernel/dracut/dracut-037-r1.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-037-r1.ebuild,v 1.1 2014/05/14 07:09:46 aidecoe Exp $ + +EAPI=4 + +inherit bash-completion-r1 eutils linux-info multilib systemd + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="http://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 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug selinux systemd" + +RESTRICT="test" + +CDEPEND="virtual/udev + systemd? ( >=sys-apps/systemd-199 ) + selinux? ( sec-policy/selinux-dracut ) + " +RDEPEND="${CDEPEND} + app-arch/cpio + >=app-shells/bash-4.0 + >sys-apps/kmod-5[tools] + || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd-sysv-utils ) + >=sys-apps/util-linux-2.21 + + debug? ( dev-util/strace ) + selinux? ( sys-libs/libselinux sys-libs/libsepol ) + " +DEPEND="${CDEPEND} + app-text/asciidoc + >=dev-libs/libxslt-1.1.26 + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + virtual/pkgconfig + " + +DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules + README.testsuite TODO ) +MY_LIBDIR=/usr/lib +PATCHES=( + "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch" + "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" + "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch" + "${FILESDIR}/${PV}-0004-Install-dracut-install-into-libexec-di.patch" + "${FILESDIR}/${PV}-0005-modsign-do-not-hardcode-path-to-keyctl.patch" + ) + +# +# Helper functions +# + +# Removes module from modules.d. +# $1 = module name +# Module name can be specified without number prefix. +rm_module() { + local force m + [[ $1 = -f ]] && force=-f + + for m in $@; do + if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then + rm ${force} --interactive=never -r "${modules_dir}"/$m + else + rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m + fi + done +} + +# Grabbed from net-misc/netctl ebuild. +optfeature() { + local desc=$1 + shift + while (( $# )); do + if has_version "$1"; then + elog " [I] $1 to ${desc}" + else + elog " [ ] $1 to ${desc}" + fi + shift + done +} + +# +# ebuild functions +# + +src_prepare() { + epatch "${PATCHES[@]}" + + local libdirs="/$(get_libdir) /usr/$(get_libdir)" + if [[ ${SYMLINK_LIB} = yes ]]; then + # Preserve lib -> lib64 symlinks in initramfs + [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" + fi + einfo "Setting libdirs to \"${libdirs}\" ..." + sed -e "3alibdirs=\"${libdirs}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + + local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" + einfo "Setting udevdir to ${udevdir}..." + sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + + if use systemd; then + local systemdutildir="$(systemd_get_utildir)" + local systemdsystemunitdir="$(systemd_get_unitdir)" + local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ + --variable=systemdsystemconfdir)" + [[ ${systemdsystemconfdir} ]] \ + || systemdsystemconfdir=/etc/systemd/system + einfo "Setting systemdutildir to ${systemdutildir} and ..." + sed -e "5asystemdutildir=\"${systemdutildir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." + sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." + sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + else + local systemdutildir="/lib/systemd" + einfo "Setting systemdutildir for standalone udev to" \ + "${systemdutildir}..." + sed -e "5asystemdutildir=\"${systemdutildir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + fi + + epatch_user +} + +src_configure() { + local myconf="--libdir=${MY_LIBDIR}" + myconf+=" --bashcompletiondir=$(get_bashcompdir)" + + if use systemd; then + myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" + fi + + econf ${myconf} +} + +src_compile() { + tc-export CC + emake doc install/dracut-install +} + +src_install() { + default + + local my_libdir="${MY_LIBDIR}" + local dracutlibdir="${my_libdir#/}/dracut" + + echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" + + insinto "${dracutlibdir}/dracut.conf.d/" + newins dracut.conf.d/gentoo.conf.example gentoo.conf + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + dodir /var/lib/dracut/overlay + + dohtml dracut.html + + # + # Modules + # + local module + modules_dir="${D%/}/${dracutlibdir}/modules.d" + + use debug || rm_module 95debug + use selinux || rm_module 98selinux + + if use systemd; then + # With systemd following modules do not make sense + rm_module 96securityfs 97masterkey 98integrity + else + rm_module 98systemd + # Without systemd following modules do not make sense + rm_module 00systemd-bootchart + fi + + # Remove modules which won't work for sure + rm_module 95fcoe # no tools + # fips module depends on masked app-crypt/hmaccalc + rm_module 01fips 02fips-aesni +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_src_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 desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" + local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ +"(initramfs/initrd) support" + + local opt desc + + # Generate ERROR_* variables for check_extra_config. + for opt in ${CONFIG_CHECK}; do + opt=${opt#\~} + desc=desc_${opt} + eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ + "is missing and REQUIRED'" + done + + check_extra_config + echo + else + ewarn "" + ewarn "Your kernel configuration couldn't be checked. Do you have" + ewarn "/usr/src/linux/.config file there? Please check manually if" + ewarn "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 + optfeature \ + "Measure performance of the boot process for later visualisation" \ + app-benchmarks/bootchart2 sys-apps/usleep 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 + 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" \ + dev-libs/openssl + optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ + app-admin/rsyslog +} diff --git a/sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch b/sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch new file mode 100644 index 000000000000..78ce946839aa --- /dev/null +++ b/sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch @@ -0,0 +1,26 @@ +From 99f913857dd38facd8f2af16a8b591fa6d7f2d45 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Mon, 31 Mar 2014 17:56:13 +0400 +Subject: [PATCH 5/5] modsign: do not hardcode path to keyctl + +https://bugs.gentoo.org/show_bug.cgi?id=506094 +--- + modules.d/03modsign/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh +index 09285d3..cc0e241 100755 +--- a/modules.d/03modsign/module-setup.sh ++++ b/modules.d/03modsign/module-setup.sh +@@ -29,7 +29,7 @@ depends() { + # called by dracut + install() { + inst_dir /lib/modules/keys +- inst_binary /usr/bin/keyctl ++ inst_binary keyctl + + inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh" + +-- +1.9.3 + |