updates

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

diff --git a/gen_funcs.sh b/gen_funcs.sh
index d4bba7b145b5e65a4f43dea20c3c59312be8aca3..b7fd72a791d322e003e0550ba1d7504bb4eed642 100755 (executable)
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -165,6 +165,11 @@ gen_die() {
        then
                print_info 1 "gen_die(): ${1}"
        fi
+       print_info 1 "Please see ${DEBUGFILE} for more info on failures"
+       print_info 1 ""
+       print_info 1 "DO NOT REPORT KERNEL COMPILE FAILURES AS GENKERNEL BUGS!"
+       print_info 1 ""
+       print_info 1 "Report real genkernel bugs to bugs.gentoo.org"
        exit 1
 }
 

diff --git a/generic/linuxrc b/generic/linuxrc
index edd0698478bf5f5e47a884f1930925015dc33846..c0b6496f9f857ccc8bdedf86bf2fe8030275f6b7 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -77,7 +77,7 @@ mkdir /newroot
 if [ "${CDROOT}" -eq "1" ]
 then
        mount -t tmpfs tmpfs /newroot
-       mkdir /newroot/dev /newroot/mnt /newroot/mnt/cdrom /newroot/mnt/loop /newroot/tmp /newroot/tmp/.initrd /newroot/mnt/gentoo
+       mkdir /newroot/dev /newroot/mnt /newroot/mnt/cdrom /newroot/mnt/livecd /newroot/tmp /newroot/tmp/.initrd /newroot/mnt/gentoo
        [ ! -e /newroot/dev/.devfsd ] && mount -t devfs devfs /newroot/dev
        devfsd /newroot/dev
        sleep 1
@@ -208,13 +208,13 @@ then
                mount -o bind /newroot/dev /dev
 
                echo "STEP 5a1: mounting loop filesystem"
-               mount -t ext2 -o loop,ro /newroot/mnt/cdrom/${LOOP} /newroot/mnt/loop
+               mount -t ext2 -o loop,ro /newroot/mnt/cdrom/${LOOP} /newroot/mnt/livecd
                if [ "$?" != "0" ]
                then
                        echo "FAILED TO MOUNT LOOP FILESYSTEM, barfing out to shell"
                        /bin/ash
                fi
-               FS_LOCATION="mnt/loop"
+               FS_LOCATION="mnt/livecd"
                umount /dev
        elif [ "${LOOPTYPE}" = "zisofs" ]
        then

diff --git a/genkernel b/genkernel
index af242216431664061d2361159df51c0b837b008d..5df0da328aa0a8dc5cbed6b4abd69b5fd9318045 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V="3.0.1_beta6"
+GK_V="3.0.1_beta7"
 TEMP="/tmp"
 
 small_die() {
@@ -100,4 +100,19 @@ then
        gen_minkernpackage
 fi
 
-print_info 1 "DONE"
+
+print_info 1 "Kernel compiled successfully!"
+print_info 1 "Required Kernel Params:"
+print_info 1 "  : root=/dev/ram0 init=/linuxrc real_root=/dev/\$ROOT"
+print_info 1 "    where \$ROOT is the devicenode for your root partition as"
+print_info 1 "    you should have specified in /etc/fstab"
+print_info 1 ""
+print_info 1 "You MUST tell your bootloader to use the generated initrd"
+print_info 1 ""
+print_info 1 "Recommended Kernel Params:"
+print_info 1 "  : vga=0x317 splash=verbose"
+print_info 1 ""
+print_info 1 "Do NOT report kernel bugs (configs included) as genkernel bugs."
+print_info 1 "Make sure you have the latest genkernel before reporting bugs"
+print_info 1 ""
+print_info 1 "For more info see /usr/share/genkernel/README"