sys-kernel/dracut-017: Fixed fstab-sys not working with dash wrt bug #406755.

Applied also patch removing check for existing /dev, because "there are a lot
of filesystems, which do not need an actual device node".

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

5 files changed, 352 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index eb023669925c..a5e96607f69c 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,16 @@
 # 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.55 2012/03/26 13:02:15 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.56 2012/03/27 16:00:43 aidecoe Exp $
+
+*dracut-017-r3 (27 Mar 2012)
+
+  27 Mar 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-017-r3.ebuild,
+  +files/dracut-017-fstab-sys-no-check-for-dev.patch,
+  +files/dracut-017-fstab-sys-remove-bashism.patch:
+  Fixed fstab-sys not working with dash wrt bug #406755.
+
+  Applied also patch removing check for existing /dev, because "there are a lot
+  of filesystems, which do not need an actual device node".
 
 *dracut-017-r2 (26 Mar 2012)
 
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 0e3d3dd355c5..a44ad2259ff6 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -5,6 +5,8 @@ AUX dracut-014-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba
 AUX dracut-014-usrmount-fsck-fix.patch 1208 RMD160 0247c724be5e130e23d89cdfc387612de5fee3f4 SHA1 65d74c80b2ed702a6cf073f0eff819bd6df022b9 SHA256 192ed24457c07d282cbdc75576d6bfc272572c482d28188c34a48c613a5b1565
 AUX dracut-017-convertfs-fix-check-for-usr-bin.patch 1595 RMD160 f5d8dd5c6284cb45c0cb561f14a255232489cc07 SHA1 d64dc3a154c41938d364bc9b1cc669ec12ed980f SHA256 3a71d98361289613b66831a6c3c2e9490513796df724b9128c403bda6847a99d
 AUX dracut-017-crypt-simplify-rd.luks.uuid-testing.patch 1768 RMD160 6884426fed59aaf7c09482f678178492225afd70 SHA1 6738c265913db46c1d5524b9ccef48e6a9f5086c SHA256 9a77bb9954fa712ba375fdf5281807395c5b6e2162d15d289eecf81f286680a8
+AUX dracut-017-fstab-sys-no-check-for-dev.patch 1076 RMD160 a9ef5dc796f44ac20167ba18497dd43cf88c1333 SHA1 ddf0da2e59b5ac34cacf4152b26635182024673e SHA256 4aa470b3d9f2134a8753b93de7aaafff62efb847c65895449f45cf9207ccad21
+AUX dracut-017-fstab-sys-remove-bashism.patch 977 RMD160 417b2ed46017f34ec6568c13fc852a5564a7e73f SHA1 1bc89b5ca02456317334af47c3bb73cf3dcfbc2f SHA256 919d1a2acde96dc1a62981b9df621e5576f47599167ea78350a36d23f910306a
 AUX dracut-017-inst_symlink-parent-dir.patch 1380 RMD160 351bf89d01557638c4e3186c01885a3b35e35235 SHA1 b109203a0013501612d7425ecb54811a9f954f51 SHA256 bd2adb523917bb3d662fd110b8e56fb53c1f5998014b00648e12f6d3643f522a
 AUX dracut-017-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 AUX dracut-017-tmpdir-option.patch 2703 RMD160 8cd44edda64f7030362a63ec142d59eda758b3f0 SHA1 5012b0cdbb9d42541d9204352b1ac9b0000e1758 SHA256 d1a676a103f6cfb908b70dbaf3e944df25544486a1e4b10d92d3f7c46117b302
@@ -15,16 +17,17 @@ DIST dracut-017.tar.bz2 165858 RMD160 57b39997142c033d3720981184dc01db0f9dfc3a S
 EBUILD dracut-014-r2.ebuild 6209 RMD160 86d5c2619aa7ab3b0a100711d840be3f2f784f84 SHA1 eb37b4d8ef907cf7733d4f581dc1ffd42cd291ef SHA256 b35e3e732bbb9a155357d62473d20e035f139708b2bd79077e1b6cfee63439d6
 EBUILD dracut-017-r1.ebuild 7549 RMD160 a290e4829fd3668c1227ba78578a1e74979f6b6f SHA1 91f4f0215f577a1839e7fffb7df2039e01907896 SHA256 6a726c927b67069d1dfea504e00583f4ed265c6a869e3bb8b2f7f061f3baf5a9
 EBUILD dracut-017-r2.ebuild 7653 RMD160 9f02d5d2a968344c3a51072be7fa0a6dc6d2669f SHA1 c881428a1b0c56a3a3a6ad322467842b06764321 SHA256 0b107a4d4f7551b4fda169bc585bf4c0926ab8c72cbe5e1f271e72760af13ed9
-MISC ChangeLog 18770 RMD160 d76fdbd8706805baafe16a818352bc7ff4759566 SHA1 2da93cccc528042fd3d1eadceaf300ed726285e8 SHA256 f20ed0dee929cbc4cd8ebaed5466b043e7b81faa7eb6a42818fe62e9c66c71b7
+EBUILD dracut-017-r3.ebuild 7771 RMD160 214b6ac6526c0da1275d6ffdcf0247c65ca3a696 SHA1 08015dea51a90433dae0b588f69575a314de0baa SHA256 ae0b12331fac2b9a9c4748fb031a523e90f90ff74734b84d52ecbd2c698b5eac
+MISC ChangeLog 19185 RMD160 5cf2b1e0c1bb58bc497f8986365cf62d93f7aa0a SHA1 e71bb1c8b10f252db1ba67ae4840815d706d1cb9 SHA256 e4578e70063efd58930db22188673718ee7548eb7cbfcf071fc701f9a9a85aa9
 MISC metadata.xml 877 RMD160 cf6e2ce3aca26d92e3b0f12b6e01b90fc0c4dd80 SHA1 06e60925a137d8794d6e2351bcc0541b0c105435 SHA256 ad5b9dc7d097e501d72f7f509eed03ff28473066b1f9234b91b99b9a47c9b4f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPcGjdAAoJEPATRTHh2/q1g0MIAJ6PjQkKKuOp3G7VRAnoTT2m
-0rUUsjtuMIjUUbnna5p8zfZvGgEEAChir6azfhAvn6W8Bs4NuBmqz9jNRKOgKUZI
-6wwJOsap2y/UYho8yrOLRDlRcM4KGXwJQcc5xliqc70YJWGYBQlKtcjPkg9IWyi9
-DKUiWTEJPk0o2otsJsXeCf+AE9+CyVXak/h8mcZY6mJ2XCeKeiLWlObS4IlkZs+o
-+DaFEth9Dqh4Ye/1Mka9RGKcCVC9s8Bi1pP1tU5a/6FMsucU4KOp27TBq0sYIsCx
-cjm2u83n04k8rn1l9L/rwrT8+ACw+kCMK8gMCruq+JFaj6E+PbkV/Rn3RTEa8K8=
-=KM78
+iQEcBAEBAgAGBQJPceQxAAoJEPATRTHh2/q1BnAH/Rjp02nyvcL07RZmUgQ25Zys
+Y+LzVjqkCZeJ1hL6kRNGWpm3kdq8wlgg3hJ/SETQdBlisjyA9OcUjLUIpOtnxtGM
+9h8jCamH8J9sbsPys0JZPoW9jVXyYGlUKyR1QPAE2FhpITOEbnPgZ8YYZeeRzGSV
+u2RcWf7qn1Ja7r73yInz9hFm72f4KfidRbexhThXeSDlsgOKH06Bxq+5SomhtnMS
+NIwiYBckkbNUK/Q1QCROJny3QHYYdVIu6z1FtpYYUKtlosYPL04bATMPVzxnKi1P
+WO22MoMYRTBB51HLlmmA3GQkgkujEveXkofo956AofxyiuSb67R1K7eKYXSZIJc=
+=OamU
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-017-r3.ebuild b/sys-kernel/dracut/dracut-017-r3.ebuild
new file mode 100644
index 000000000000..e514e95784e2
--- /dev/null
+++ b/sys-kernel/dracut/dracut-017-r3.ebuild
@@ -0,0 +1,274 @@
+# 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-017-r3.ebuild,v 1.1 2012/03/27 16:00:43 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="
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	"
+
+#
+# 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}-usrmount-fstab-comments.patch"
+	epatch "${FILESDIR}/${P}-usrmount-newroot-etc-check.patch"
+	epatch "${FILESDIR}/${P}-convertfs-fix-check-for-usr-bin.patch"
+	epatch "${FILESDIR}/${P}-crypt-simplify-rd.luks.uuid-testing.patch"
+	epatch "${FILESDIR}/${P}-inst_symlink-parent-dir.patch"
+	epatch "${FILESDIR}/${P}-tmpdir-option.patch"
+	epatch "${FILESDIR}/${P}-fstab-sys-no-check-for-dev.patch"
+	epatch "${FILESDIR}/${P}-fstab-sys-remove-bashism.patch"
+}
+
+src_compile() {
+	emake WITH_SWITCH_ROOT=0
+}
+
+src_install() {
+	emake WITH_SWITCH_ROOT=0 \
+		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
+
+	#
+	# 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 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-017-fstab-sys-no-check-for-dev.patch b/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch
new file mode 100644
index 000000000000..86ce9010dd9c
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch
@@ -0,0 +1,29 @@
+From 6dd4370eaa5a7e627bbd34535b6779eaa41ae44c Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 27 Mar 2012 16:00:28 +0200
+Subject: [PATCH 2/2] 95fstab-sys/mount-sys.sh: removed check for existing
+ /dev
+
+there are a lot of filesystems, which do not need an actual device node
+---
+ modules.d/95fstab-sys/mount-sys.sh |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
+index 8c9cb29..54415d1 100755
+--- a/modules.d/95fstab-sys/mount-sys.sh
++++ b/modules.d/95fstab-sys/mount-sys.sh
+@@ -11,10 +11,6 @@ fstab_mount() {
+     info "Mounting from $1"
+     while read _dev _mp _fs _opts _dump _pass _rest; do
+         [ -z "${_dev%%#*}" ] && continue # Skip comment lines
+-        if [[ ! "$_fs" =~ "nfs" ]] && [ ! -e "$_dev" ]; then
+-            warn "Device $_dev doesn't exist, skipping mount."
+-            continue
+-        fi
+         if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then
+             fsck_single "$_dev" "$_fs"
+         fi
+-- 
+1.7.8.5
+
diff --git a/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch b/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch
new file mode 100644
index 000000000000..3b6c69ffccbf
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch
@@ -0,0 +1,27 @@
+From 0441230c51121c4a6e184b354a2f3a7cacb47b3b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 27 Mar 2012 16:00:02 +0200
+Subject: [PATCH 1/2] 95fstab-sys/mount-sys.sh: removed bashism
+
+---
+ modules.d/95fstab-sys/mount-sys.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
+index 0f660b7..8c9cb29 100755
+--- a/modules.d/95fstab-sys/mount-sys.sh
++++ b/modules.d/95fstab-sys/mount-sys.sh
+@@ -20,8 +20,8 @@ fstab_mount() {
+         fi
+         _fs=$(det_fs "$_dev" "$_fs")
+         info "Mounting $_dev"
+-        if [[ -d $NEWROOT/$_mp ]]; then
+-            mount -v -t $_fs -o $_opts $_dev $NEWROOT/$_mp 2>&1 | vinfo
++        if [ -d "$NEWROOT/$_mp" ]; then
++            mount -v -t $_fs -o $_opts $_dev "$NEWROOT/$_mp" 2>&1 | vinfo
+         else
+             mkdir -p "$_mp"
+             mount -v -t $_fs -o $_opts $_dev $_mp 2>&1 | vinfo
+-- 
+1.7.8.5
+