Added patches from François-Xavier Roure <fx_roure@yahoo.fr> from bug #149020. This...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@474 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 4e50f5c7258ff0b0258fff05b06b4880168ee21c..8cfb3a2acbd6c0dbcc1bdca2889b66cecddbda7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initrd.sh,
+  generic/linuxrc, genkernel:
+  Added patches from François-Xavier Roure <fx_roure@yahoo.fr> from bug
+  #149020. This will end up being genkernel 3.4.6, most likely.
+
   14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
   Adjust selinux stuff in gen_compile.sh to actually do what we intended, not
   the opposite.

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 575586b86b7b6f84595b13c5cf3f630756a6fef1..b31be8a08b18e0f52d8a28332db1a919550a0127 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -8,7 +8,7 @@ create_initrd_loop() {
                gen_die 'Could not create loopback mount directory!'
        dd if=/dev/zero of=${TMPDIR}/initrd-${KV} bs=1k count=${1} >> "${DEBUGFILE}" 2>&1 ||
                gen_die "Could not zero initrd-${KV}"
-       mke2fs -F -N500 -q "${TMPDIR}/initrd-${KV}" >> "${DEBUGFILE}" 2>&1 ||
+       mke2fs -F -N750 -q "${TMPDIR}/initrd-${KV}" >> "${DEBUGFILE}" 2>&1 ||
                gen_die "Could not format initrd-${KV}!"
        mount -t ext2 -o loop "${TMPDIR}/initrd-${KV}" "${TEMP}/initrd-mount" >> "${DEBUGFILE}" 2>&1 ||
                gen_die 'Could not mount the initrd filesystem!'
@@ -236,9 +236,9 @@ create_base_initrd_sys() {
        fi      
 
        for i in '[' ash basename cat chroot clear cp dirname echo env false find \
-       grep gunzip gzip ln ls loadkmap losetup lsmod mkdir mknod more mount mv \
-       pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true umount uname \
-       xargs yes zcat chmod chown cut kill killall; do
+       grep gunzip gzip ln ls loadkmap losetup lsmod mdev mkdir mknod more mount \
+       mv pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true \
+       umount uname xargs yes zcat chmod chown cut kill killall; do
                rm -f ${TEMP}/initrd-temp/bin/$i > /dev/null
                ln  ${TEMP}/initrd-temp/bin/busybox ${TEMP}/initrd-temp/bin/$i ||
                        gen_die "Busybox error: could not link ${i}!"
@@ -396,7 +396,7 @@ create_initrd() {
        create_initrd_aux
 
        INITRD_CALC_SIZE=`calc_initrd_size`
-       INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 100`
+       INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 250`
        print_info 1 "        :: Size is at ${INITRD_SIZE}K"
        print_info 1 "        >> Creating loopback filesystem..."
        create_initrd_loop ${INITRD_SIZE}

diff --git a/generic/linuxrc b/generic/linuxrc
index b5c1d7b3a4c032fe23e8fc6a293054161dacc011..434b8f981fc7cd7b736009149aaa5352dc392039 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -670,7 +670,7 @@ then
        mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move unionfs /memory into the system root!'
 fi
 
-if [ "$0" = '/linuxrc' ]
+if [ "$0" = '/linuxrc' ] || [ "$0" = 'linuxrc' ]
 then
        [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1
        echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting"

diff --git a/genkernel b/genkernel
index 37399ccdf282c9d4e24d76d73a3bf8445357374e..af983bed90cf6bc5b7a358061456be15eddeeef3 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.5'
+GK_V='3.4.6'
 
 TMPDIR='/var/tmp/genkernel'
 TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$