fix for 29694

5 files changed, 79 insertions, 2 deletions

diff --git a/sys-apps/mkinitrd/ChangeLog b/sys-apps/mkinitrd/ChangeLog
index ced19bfca99a..3f1388579ebe 100644
--- a/sys-apps/mkinitrd/ChangeLog
+++ b/sys-apps/mkinitrd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/mkinitrd
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.7 2003/10/27 19:01:58 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.8 2003/11/01 04:46:06 pebenito Exp $
+
+*mkinitrd-3.5.7-r2 (31 Oct 2003)
+
+  31 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r2.ebuild,
+  files/mkinitrd-lvm_statics.diff:
+  Change vgwrapper to static vgscan and vgchange to fix #29694. Using modified
+  patch from Sascha Silbe.
 
   27 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r1.ebuild,
   mkinitrd-3.5.7.ebuild:
diff --git a/sys-apps/mkinitrd/Manifest b/sys-apps/mkinitrd/Manifest
index 7097ed082c23..57fc070e2c27 100644
--- a/sys-apps/mkinitrd/Manifest
+++ b/sys-apps/mkinitrd/Manifest
@@ -1,7 +1,10 @@
+MD5 bd83490f799a3cce4cf61d02189150ec mkinitrd-3.5.7-r2.ebuild 1223
 MD5 ca4ee366637efb54ec1530cae9153f23 mkinitrd-3.5.7-r1.ebuild 1105
-MD5 e1fd4c099ab3d5480d40151194912d75 ChangeLog 1090
+MD5 2a95a90558846074fb43e7b699ffdfc1 ChangeLog 1344
 MD5 80d5be275d0b73e0d36e0ebd4239abf5 metadata.xml 600
 MD5 6c60b28af481a2520e4bb3e179616670 mkinitrd-3.5.7.ebuild 965
 MD5 0bc4fe62070fcfc54254d0e8c636ef32 files/mkinitrd-selinux.diff 1007
 MD5 1a8259233cb009f44a8fe20a8aa828b5 files/digest-mkinitrd-3.5.7-r1 66
 MD5 1a8259233cb009f44a8fe20a8aa828b5 files/digest-mkinitrd-3.5.7 66
+MD5 4e09d06fedbff01e9e17219e50873694 files/mkinitrd-lvm_statics.diff 591
+MD5 1a8259233cb009f44a8fe20a8aa828b5 files/digest-mkinitrd-3.5.7-r2 66
diff --git a/sys-apps/mkinitrd/files/digest-mkinitrd-3.5.7-r2 b/sys-apps/mkinitrd/files/digest-mkinitrd-3.5.7-r2
new file mode 100644
index 000000000000..23b2306d4721
--- /dev/null
+++ b/sys-apps/mkinitrd/files/digest-mkinitrd-3.5.7-r2
@@ -0,0 +1 @@
+MD5 42d10a781554d8fda18b321f254e78c5 mkinitrd-3.5.7.tar.bz2 53233
diff --git a/sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff b/sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff
new file mode 100644
index 000000000000..c690b9b3b585
--- /dev/null
+++ b/sys-apps/mkinitrd/files/mkinitrd-lvm_statics.diff
@@ -0,0 +1,15 @@
+diff -urN mkinitrd-3.5.7.orig/mkinitrd mkinitrd-3.5.7/mkinitrd
+--- mkinitrd-3.5.7.orig/mkinitrd	2003-07-09 18:26:02.000000000 -0500
++++ mkinitrd-3.5.7/mkinitrd	2003-10-25 11:56:32.083678110 -0500
+@@ -534,9 +534,8 @@
+ 	cp $verbose --parents -a $pv $MNTIMAGE/
+     done
+ 
+-    inst /sbin/vgwrapper "$MNTIMAGE/bin/vgwrapper"
+-    ln "$MNTIMAGE/bin/vgwrapper" "$MNTIMAGE/bin/vgscan"
+-    ln "$MNTIMAGE/bin/vgwrapper" "$MNTIMAGE/bin/vgchange"
++    inst /sbin/vgscan.static "$MNTIMAGE/bin/vgscan"
++    inst /sbin/vgchange.static "$MNTIMAGE/bin/vgchange"
+ 
+     mknod $MNTIMAGE/dev/lvm b 109 0
+ fi
diff --git a/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild b/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild
new file mode 100644
index 000000000000..ab0177049874
--- /dev/null
+++ b/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild,v 1.1 2003/11/01 04:46:06 pebenito Exp $
+
+IUSE="selinux"
+
+DESCRIPTION="Tools for creating initrd images"
+HOMEPAGE="http://www.redhat.com"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="dev-libs/popt
+	>=sys-kernel/linux-headers-2.4.19-r1
+	x86? ( dev-libs/dietlibc )"
+
+RDEPEND="app-shells/bash"
+
+PDEPEND="selinux? ( sys-apps/policycoreutils )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Fix for coreutils tail behavior
+	sed -i -e 's/tail -1/tail -n 1/' mkinitrd || die "sed for tail -1 failed."
+
+	# bug 29694 -- Change vgwrapper to static vgscan and vgchange
+	epatch ${FILESDIR}/mkinitrd-lvm_statics.diff
+
+	# SELinux policy load
+	use selinux && epatch ${FILESDIR}/mkinitrd-selinux.diff
+}
+
+src_compile() {
+	cd ${S}/nash
+	emake || die "nash compile failed."
+
+	cd ${S}/grubby
+	emake || die "grubby compile failed."
+}
+
+src_install() {
+	into /
+	dosbin ${S}/grubby/grubby ${S}/nash/nash ${S}/mkinitrd
+	doman ${S}/grubby/grubby.8 ${S}/nash/nash.8 ${S}/mkinitrd.8
+}