Fix genkernel finishing info messages to be more accurate

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

diff --git a/genkernel b/genkernel
index 8f42f500eb595737f699197bf5a117d03b1142e3..2bafbf5cd0ed5168e7434bfcf4225c7d5ad8d761 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -350,39 +350,48 @@ then
                print_info 1 '    one specified in /etc/fstab'
                print_info 1 ''
                print_info 1 "If you require Genkernel's hardware detection features; you MUST"
-               print_info 1 'tell your bootloader to use the provided initrd file. Otherwise;'
+               print_info 1 'tell your bootloader to use the provided INITRAMFS file. Otherwise;'
                print_info 1 'substitute the root argument for the real_root argument if you are'
                print_info 1 'not planning to use the initrd...'
        else    
                print_info 1 '    root=/dev/ram0 real_root=/dev/$ROOT init=/linuxrc'
-               [ "${INITRD_SIZE}" -ge 4096 ] && print_info 1 "    ramdisk_size=8192"
-               [ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support at boot time'
-               [ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms" for evms support at boot time'
-               [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support at boot time'
-               [ "${DMRAID}" -eq '1' ] && print_info 1 'or "dodmraid=<additional options>"'
+               [ "${INITRD_SIZE}" -ge 4096 ] && print_info 1 "    ramdisk_size=${INITRD_SIZE}"
                print_info 1 '    [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
                print_info 1 ''
                print_info 1 '    Where $ROOT is the device node for your root partition as the'
                print_info 1 '    one specified in /etc/fstab'
                print_info 1 ''
                print_info 1 "If you require Genkernel's hardware detection features; you MUST"
-               print_info 1 'tell your bootloader to use the provided initrd file. Otherwise;'
+               print_info 1 'tell your bootloader to use the provided INITRD file. Otherwise;'
                print_info 1 'substitute the root argument for the real_root argument if you are'
                print_info 1 'not planning to use the initrd...'
        fi
-else
-       print_info 1 ''
+fi
+
+if [ "${BUILD_INITRD}" -eq '1' ]
+then
+       echo
        if [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ]
        then
-           print_info 1 'initramfs compiled successfully!'
+           print_info 1 'The initramfs compiled successfully!'
        else
-           print_info 1 'initrd compiled successfully!'
+           print_info 1 'The initrd compiled successfully!'
        fi
+               echo
+               echo
+               print_info 1 'WARNING... WARNING... WARNING...'
+               print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
+               [ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support at boot time'
+               [ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms" for evms support at boot time'
+               [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support at boot time'
+               [ "${DMRAID}" -eq '1' ] && print_info 1 '       or "dodmraid=<additional options>"'
+               [ "${UNIONFS}" -eq '1' ] && print_info 1 'add "unionfs" for dmraid support at boot time'
+               [ "${UNIONFS}" -eq '1' ] && print_info 1 '      or "unionfs=<block_device>"'
 fi
 
 if [ "${CMD_NOINSTALL}" != '1' -a "${SYMLINK}" = '1' ]
 then 
-    print_info 1 ''
+    echo
     print_info 1 'Creating symlinks'
     
     
@@ -420,7 +429,7 @@ fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro /boot
 
-print_info 1 ''
+echo
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'
 print_info 1 'is about the default genkernel configuration...'
 print_info 1 ''