Fixes bug #411821. Thanks to Nikoli <nikoli@lavabit.com> for the patch.

Package-Manager: portage-2.1.10.59/cvs/Linux x86_64

4 files changed, 305 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 572b0afcc56f..622f3a66f561 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,12 @@
 # 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.59 2012/05/09 10:04:54 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.60 2012/05/16 09:49:32 aidecoe Exp $
+
+*dracut-018-r1 (16 May 2012)
+
+  16 May 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-018-r1.ebuild,
+  +files/dracut-018-lsinitrd-support-symlinks.patch:
+  Fixes bug #411821.  Thanks to Nikoli <nikoli@lavabit.com> for the patch.
 
   09 May 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-017-r1.ebuild,
   -dracut-017-r2.ebuild, -dracut-017-r3.ebuild,
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 143d7b2025ab..e7c27921e3f5 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -3,21 +3,23 @@ Hash: SHA1
 
 AUX dracut-014-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 AUX dracut-014-usrmount-fsck-fix.patch 1208 RMD160 0247c724be5e130e23d89cdfc387612de5fee3f4 SHA1 65d74c80b2ed702a6cf073f0eff819bd6df022b9 SHA256 192ed24457c07d282cbdc75576d6bfc272572c482d28188c34a48c613a5b1565
+AUX dracut-018-lsinitrd-support-symlinks.patch 699 RMD160 fd399d2bdeef80b09500e58933b2ebfe2add9a9a SHA1 62913d739d7431990290a13e68c087a3e52f3298 SHA256 b2d422b0a026265101045b641a2b4cef20e0ca15ca3e6fce8616d721b334ea2f
 AUX dracut-018-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 DIST dracut-014.tar.bz2 155914 RMD160 bc20154b11f2924fe971f3fecb13ce18630adac5 SHA1 8a041beb9d1ca2b8fcc94c7619fd6b6093f02577 SHA256 1b81a71d121fa4e268bab098daadabb3077ecde7573b5726fe35591347fdd2e3
 DIST dracut-018.tar.bz2 189067 RMD160 52aac6e60525ff4f54b8483f9a7694365792d710 SHA1 70ba92d32e44d34701eff53bc78c5b05fe97a5f8 SHA256 3ebc0e9c9df24802dd4061aea6907670453fc865257885abfd9166af5caccb42
 EBUILD dracut-014-r2.ebuild 6209 RMD160 86d5c2619aa7ab3b0a100711d840be3f2f784f84 SHA1 eb37b4d8ef907cf7733d4f581dc1ffd42cd291ef SHA256 b35e3e732bbb9a155357d62473d20e035f139708b2bd79077e1b6cfee63439d6
+EBUILD dracut-018-r1.ebuild 7237 RMD160 594c35fd55aaa859c0e5d2a5b515fcb37627cdb9 SHA1 e1a9a1ea3ece51e83521a24c9f2091114e0c27a0 SHA256 9225b2867e0bd656f5596178519089c1686a374b498959273fa420ba0bf46279
 EBUILD dracut-018.ebuild 7175 RMD160 5d073f8a8a47fcaab65b3ef3d7246b842183def6 SHA1 0d65aa2701fe18d2a18ace228aad2b2f7907a271 SHA256 b4f1aaf03b6f83bc9b0d0ee04014f0b25f622e3482d578db6cc380f7b421dc03
-MISC ChangeLog 21068 RMD160 cd51142f1bd5eab534ac472eaa6fc58453ec9e36 SHA1 e915c304bfffbe3c90e166da86e2a69454014305 SHA256 5fda5fe5210698fd6aeb564e5e603ab882e41691cd86a20a7a6ef0ca82e452d3
+MISC ChangeLog 21307 RMD160 669eb2fbf52ee9cae60819ec96543a949f293485 SHA1 d1b299e1164957458c6fb64f9b5ddc243223afa7 SHA256 40a9f75b87569d196b376a3a0865642edbc2c5b0b05fe4c8a35db3e61b4af2fc
 MISC metadata.xml 877 RMD160 cf6e2ce3aca26d92e3b0f12b6e01b90fc0c4dd80 SHA1 06e60925a137d8794d6e2351bcc0541b0c105435 SHA256 ad5b9dc7d097e501d72f7f509eed03ff28473066b1f9234b91b99b9a47c9b4f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPqkFLAAoJEPATRTHh2/q1u10H/AhDJnCS4LLLRjX/evwOQUDB
-r5Iwxor0lFRgSWHFtyG2nWEkrY6pNEyf8oaHmqwXiDpDcxM9PHZIJslVYOBADjoq
-GUKiTwK4CMDkt6Avy6vdQ+14oV+uUTF2p/6MkGqpbDanAkhE6O63JlhqhF2yWVyr
-EUtPB7vL+ZQY1ugItujC9nP7Lra7MSCjTAZFkmdFCNvu+9WO0GkkRAUZYblQxMLz
-J0CxKxo3dNsmUZRqAdgdvjj3G61nwA6XX8jSmEHszN0xOA4d3nLFg+HQ8SmPoF38
-v9K6rs5otGg6V2q3vhqEVNF8e7iu0sTRcEjU+dKyOg1iCqR+pbZhfwyVXXenRJ0=
-=Rxhm
+iQEcBAEBAgAGBQJPs3gyAAoJEPATRTHh2/q1pVAH/AnpzwU0Oi178Dn1niRNuawp
+Fn5prtVDAuMt/WIzTD5DYstW9b6Jwp1jcTdA4ehD8XFDFBORFS8Mx5R629SAt3u/
+wXvjZ/+m2EGk8wvF43C8CUmBKD8tCfeXL2D53+pUwFcL/QS5RvsKeJQO6zUrSiT5
+gFLKiA4IHm+Z9W8Da34Ct8Mgoca5p2a8C/bX7jsy2t5aORos9rW2ZIxT0gA3SAX9
+x9grQ/VxbsPIdoCNCYhprv5Hu9qSkq34H6aYBKEigJ99ajAP0sNt7jk9IQzRR46P
+JnL9mdrLAGTs8VJoG43zSkcEr8zRntQwVZAhVxbWmmHNvDpfIe5lS8+cGt9HaqY=
+=4pId
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-018-r1.ebuild b/sys-kernel/dracut/dracut-018-r1.ebuild
new file mode 100644
index 000000000000..9acdabc8844f
--- /dev/null
+++ b/sys-kernel/dracut/dracut-018-r1.ebuild
@@ -0,0 +1,263 @@
+# 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-018-r1.ebuild,v 1.1 2012/05/16 09:49:32 aidecoe Exp $
+
+EAPI=4
+
+inherit eutils linux-info
+
+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_livenet? ( dracut_modules_dmsquash-live )
+	"
+COMMON_MODULES="
+	dracut_modules_biosdevname
+	dracut_modules_btrfs
+	dracut_modules_caps
+	dracut_modules_crypt-gpg
+	dracut_modules_gensplash
+	dracut_modules_mdraid
+	dracut_modules_multipath
+	dracut_modules_plymouth
+	dracut_modules_syslog
+	"
+DM_MODULES="
+	dracut_modules_crypt
+	dracut_modules_dmraid
+	dracut_modules_dmsquash-live
+	dracut_modules_livenet
+	dracut_modules_lvm
+	"
+NETWORK_MODULES="
+	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 net selinux ${IUSE_DRACUT_MODULES}"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=app-shells/dash-0.5.4.11
+	>=sys-apps/baselayout-1.12.14-r1
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.20
+	>=sys-fs/udev-164
+	app-arch/cpio
+	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
+
+	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 sys-apps/iproute2 )
+	selinux? ( sys-libs/libselinux sys-libs/libsepol )
+	dracut_modules_biosdevname? ( sys-apps/biosdevname )
+	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
+	dracut_modules_caps? ( sys-libs/libcap )
+	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=""
+
+#
+# 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
+}
+
+# Displays Gentoo Base System major release number
+base_sys_maj_ver() {
+	local line
+
+	read line < /etc/gentoo-release
+	line=${line##* }
+	echo "${line%%.*}"
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
+	epatch "${FILESDIR}/${P}-lsinitrd-support-symlinks.patch"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install
+
+	local gen2conf
+
+	dodir /var/lib/dracut/overlay
+	dodoc HACKING TODO AUTHORS NEWS README*
+
+	case "$(base_sys_maj_ver)" in
+		1) gen2conf=gentoo.conf ;;
+		2) gen2conf=gentoo-openrc.conf ;;
+		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
+	esac
+
+	insinto /etc/dracut.conf.d
+	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	dohtml dracut.html
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D}/usr/lib/dracut/modules.d"
+
+	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
+		|| die 'dracut-version failed'
+
+	# 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 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists; then
+		echo
+		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."
+		echo
+
+		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
+		echo
+		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"
+		echo
+	fi
+
+	elog 'To generate the initramfs:'
+	elog '    # mount /boot (if necessary)'
+	elog '    # dracut "" <kernel-version>'
+	elog ''
+	elog 'For command line documentation see dracut.kernel(7).'
+	elog ''
+	elog 'Simple example to select root and resume partition:'
+	elog '    root=/dev/sda1 resume=/dev/sda2'
+	elog ''
+	elog 'To include only dracut modules and kernel drivers for this system,'
+	elog 'use the "-H" option.  Some modules need to be explicitly added with'
+	elog '"-a" option even if required tools are installed.'
+}
diff --git a/sys-kernel/dracut/files/dracut-018-lsinitrd-support-symlinks.patch b/sys-kernel/dracut/files/dracut-018-lsinitrd-support-symlinks.patch
new file mode 100644
index 000000000000..c95331abc936
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-018-lsinitrd-support-symlinks.patch
@@ -0,0 +1,25 @@
+From d8cb6a4ef1b51656566529f2315aa0828d693846 Mon Sep 17 00:00:00 2001
+From: Nikoli <nikoli@lavabit.com>
+Date: Tue, 17 Apr 2012 11:31:27 +0200
+Subject: [PATCH] lsinitrd: support symlinks
+
+---
+ lsinitrd.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lsinitrd.sh b/lsinitrd.sh
+index 1eaa37d..e6767dc 100755
+--- a/lsinitrd.sh
++++ b/lsinitrd.sh
+@@ -34,7 +34,7 @@ image="${1:-/boot/initramfs-$(uname -r).img}"
+ [[ -f "$image" ]]    || { echo "$image does not exist" ; exit 1 ; }
+ 
+ CAT=zcat
+-FILE_T=$(file "$image")
++FILE_T=$(file --dereference "$image")
+ 
+ if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then
+     XZ_SINGLE_STREAM="--single-stream"
+-- 
+1.7.8.6
+