From 82216c121a53eb465c201d6aa793b9b0ccdcdc46 Mon Sep 17 00:00:00 2001 From: Amadeusz Piotr Żołnowski Date: Sun, 7 Oct 2012 15:57:17 +0000 Subject: Fixes for bug #436712, bug #437142 and bug #437270. Thanks to Jonathan Callen , Nikoli and Alexander Tsoy . (Portage version: 2.1.11.24/cvs/Linux x86_64) --- sys-kernel/dracut/ChangeLog | 13 +- sys-kernel/dracut/dracut-023-r1.ebuild | 275 +++++++++++++++++++++ ...01-dracut-functions.sh-find_binary-path-s.patch | 41 +++ ...02-90crypt-call-systemd-commands-only-if-.patch | 31 +++ 4 files changed, 359 insertions(+), 1 deletion(-) create mode 100644 sys-kernel/dracut/dracut-023-r1.ebuild create mode 100644 sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch create mode 100644 sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch (limited to 'sys-kernel/dracut') diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 53dd8a2d8dd0..39017f6cf76f 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.87 2012/09/09 16:48:14 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.88 2012/10/07 15:57:17 aidecoe Exp $ + +*dracut-023-r1 (07 Oct 2012) + + 07 Oct 2012; Amadeusz Żołnowski + +files/023-0001-dracut-functions.sh-find_binary-path-s.patch, + +files/023-0002-90crypt-call-systemd-commands-only-if-.patch, + +dracut-023-r1.ebuild: + Fixes for bug #436712, bug #437142 and bug #437270. + + Thanks to Jonathan Callen , Nikoli and + Alexander Tsoy . 09 Sep 2012; Amadeusz Żołnowski dracut-014-r3.ebuild, dracut-018-r2.ebuild, dracut-019-r5.ebuild, dracut-022-r5.ebuild, diff --git a/sys-kernel/dracut/dracut-023-r1.ebuild b/sys-kernel/dracut/dracut-023-r1.ebuild new file mode 100644 index 000000000000..f7695696f263 --- /dev/null +++ b/sys-kernel/dracut/dracut-023-r1.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-023-r1.ebuild,v 1.1 2012/10/07 15:57:17 aidecoe Exp $ + +EAPI=4 + +inherit eutils linux-info toolchain-funcs + +add_req_use_for() { + local dep="$1"; shift + local f + + for f in "$@"; do + REQUIRED_USE+="${f}? ( ${dep} ) +" + done +} + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="http://dracut.wiki.kernel.org" +SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt ) + dracut_modules_crypt-loop? ( dracut_modules_crypt ) + dracut_modules_livenet? ( dracut_modules_dmsquash-live ) + " +COMMON_MODULES=" + dracut_modules_biosdevname + dracut_modules_bootchart + dracut_modules_btrfs + dracut_modules_caps + dracut_modules_crypt-gpg + dracut_modules_crypt-loop + dracut_modules_gensplash + dracut_modules_mdraid + dracut_modules_multipath + dracut_modules_plymouth + dracut_modules_syslog + dracut_modules_systemd + " +DM_MODULES=" + dracut_modules_crypt + dracut_modules_dmraid + dracut_modules_dmsquash-live + dracut_modules_livenet + dracut_modules_lvm + " +NETWORK_MODULES=" + dracut_modules_cifs + dracut_modules_iscsi + dracut_modules_livenet + dracut_modules_nbd + dracut_modules_nfs + dracut_modules_ssh-client + " +add_req_use_for device-mapper ${DM_MODULES} +add_req_use_for net ${NETWORK_MODULES} +IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}" +IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}" + +RESTRICT="test" + +CDEPEND=">sys-fs/udev-166 + dracut_modules_systemd? ( sys-apps/systemd ) + " +RDEPEND="${CDEPEND} + app-arch/cpio + >=app-shells/bash-4.0 + >=app-shells/dash-0.5.4.11 + >=sys-apps/baselayout-1.12.14-r1 + || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] ) + >=sys-apps/sysvinit-2.87-r3 + >=sys-apps/util-linux-2.21 + + debug? ( dev-util/strace ) + device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) ) + net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1[client] sys-apps/iproute2 ) + selinux? ( sys-libs/libselinux sys-libs/libsepol ) + dracut_modules_biosdevname? ( sys-apps/biosdevname ) + dracut_modules_bootchart? ( app-benchmarks/bootchart2 ) + dracut_modules_btrfs? ( sys-fs/btrfs-progs ) + dracut_modules_caps? ( sys-libs/libcap ) + dracut_modules_cifs? ( net-fs/cifs-utils ) + dracut_modules_crypt? ( sys-fs/cryptsetup ) + dracut_modules_crypt-gpg? ( app-crypt/gnupg ) + dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) + dracut_modules_gensplash? ( media-gfx/splashutils ) + dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) + dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) + dracut_modules_mdraid? ( sys-fs/mdadm ) + dracut_modules_multipath? ( sys-fs/multipath-tools ) + dracut_modules_nbd? ( sys-block/nbd ) + dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) + dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) + dracut_modules_ssh-client? ( dev-libs/openssl ) + dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) ) + " +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 + " + +# +# Helper functions +# + +# Returns true if any of specified modules is enabled by USE flag and false +# otherwise. +# $1 = list of modules (which have corresponding USE flags of the same name) +any_module() { + local m modules=" $@ " + + for m in ${modules}; do + ! use $m && modules=${modules/ $m / } + done + + shopt -s extglob + modules=${modules%%+( )} + shopt -u extglob + + [[ ${modules} ]] +} + +# 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 +} + +# +# ebuild functions +# + +src_prepare() { + epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-find_binary-path-s.patch" + epatch "${FILESDIR}/${PV}-0002-90crypt-call-systemd-commands-only-if-.patch" + + local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)" + [[ ${udevdir} ]] || die "Couldn't detect udevdir" + einfo "Setting udevdir to ${udevdir}..." + sed -e "s@udevdir=.*@udevdir=\"${udevdir}\"@" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + + if use dracut_modules_systemd; then + local systemdutildir="$($(tc-getPKG_CONFIG) systemd \ + --variable=systemdutildir)" + local systemdsystemunitdir="$($(tc-getPKG_CONFIG) systemd \ + --variable=systemdsystemunitdir)" + [[ ${systemdutildir} ]] || die "Couldn't detect systemdutildir" + [[ ${systemdsystemunitdir} ]] \ + || die "Couldn't detect systemdsystemunitdir" + einfo "Setting systemdutildir to ${systemdutildir} and ..." + sed -e "4asystemdutildir=\"${systemdutildir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..." + sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + fi +} + +src_compile() { + emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" doc + if use optimization; then + ewarn "Enabling experimental optimization!" + tc-export CC + emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install/dracut-install + fi +} + +src_install() { + local libdir="/usr/lib" + + emake prefix=/usr libdir="${libdir}" sysconfdir=/etc \ + DESTDIR="${D}" install + + dodir /var/lib/dracut/overlay + dodoc HACKING TODO AUTHORS NEWS README* + + insinto /etc/dracut.conf.d + newins dracut.conf.d/gentoo.conf.example gentoo.conf + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + dohtml dracut.html + + # + # Modules + # + local module + modules_dir="${D%/}/${libdir#/}/dracut/modules.d" + + # Remove modules not enabled by USE flags + for module in ${IUSE_DRACUT_MODULES} ; do + ! use ${module} && rm_module -f ${module#dracut_modules_} + done + + # Those flags are specific, and even are corresponding to modules, they need + # to be declared as regular USE flags. + use debug || rm_module 95debug + use selinux || rm_module 98selinux + + # Following flags define set of helper modules which are base dependencies + # for others and as so have no practical use, so remove these modules. + use device-mapper || rm_module 90dm + use net || rm_module 40network 45ifcfg 45url-lib + + # Remove S/390 modules which are not tested at all + rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet + + # 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 + + # Remove extra modules which go to future dracut-extras + rm_module 05busybox 97masterkey 98ecryptfs 98integrity +} + +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 ~MODULES" + + # 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 desc_MODULES="Enable loadable module 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 " CONFIG_MODULES" + ewarn "" + fi +} diff --git a/sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch b/sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch new file mode 100644 index 000000000000..dace9dd95d9f --- /dev/null +++ b/sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch @@ -0,0 +1,41 @@ +From 3d15bc001e6ae4d92ff749a8159f9d1bfa2a7a74 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 7 Oct 2012 14:23:29 +0200 +Subject: [PATCH 1/2] dracut-functions.sh: find_binary: path starting with + variable + +Credits go to Alexander Tsoy who provided the +patch with following explanation: + + I get messages "Skipping program $env{DM_SBIN_PATH}/..." when + generating initramfs. This happens because some udev rules contains + variables in path to command: + + $ egrep -r 'IMPORT\{program\}=\"\$' /lib64/udev/rules.d/ + /lib64/udev/rules.d/10-dm.rules:ENV{DM_COOKIE}=="?*", IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup udevflags $env{DM_COOKIE}" + + [...] + + $ sudo dracut -f "" 3.5.4-hardened-r1 + I: *** Including module: dm *** + I: Skipping program $env{DM_SBIN_PATH}/dmsetup using in udev rule 10-dm.rules as it cannot be found +--- + dracut-functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 2ad8f4a..43a0e16 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -45,7 +45,7 @@ find_binary() { + fi + fi + +- type -P $1 ++ type -P ${1##*/} + } + + if ! [[ $dracutbasedir ]]; then +-- +1.7.12 + diff --git a/sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch b/sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch new file mode 100644 index 000000000000..d35962d82f23 --- /dev/null +++ b/sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch @@ -0,0 +1,31 @@ +From df079b0cc8f5f0e564078c89513412f37ab58771 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 7 Oct 2012 15:00:22 +0200 +Subject: [PATCH 2/2] 90crypt: call systemd commands only if systemd binaries + are there + +--- + modules.d/90crypt/crypt-run-generator.sh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh +index f2f2da1..aed2f20 100755 +--- a/modules.d/90crypt/crypt-run-generator.sh ++++ b/modules.d/90crypt/crypt-run-generator.sh +@@ -12,7 +12,10 @@ if [ -f /etc/crypttab ]; then + fi + + echo "$luks $dev" >> /etc/crypttab +-/lib/systemd/system-generators/systemd-cryptsetup-generator +-systemctl daemon-reload +-systemctl start cryptsetup.target ++if [ -x /lib/systemd/system-generators/systemd-cryptsetup-generator ] && ++ command -v systemctl >/dev/null; then ++ /lib/systemd/system-generators/systemd-cryptsetup-generator ++ systemctl daemon-reload ++ systemctl start cryptsetup.target ++fi + exit 0 +-- +1.7.12 + -- cgit v1.2.3-65-gdbad