diff -Naurp genkernel-orig/gen_cmdline.sh genkernel/gen_cmdline.sh
--- genkernel-orig/gen_cmdline.sh 2007-09-23 14:22:15.000000000 +0200
+++ genkernel/gen_cmdline.sh 2007-09-23 14:28:02.000000000 +0200
@@ -45,6 +45,7 @@ longusage() {
echo " --static Build a static (monolithic kernel)."
echo " --initramfs Builds initramfs before kernel and embeds it"
echo " into the kernel."
+ echo " --v86d Install v86d into the initramfs (required for uvesafb)"
echo " Kernel settings"
echo " --kerneldir=
Location of the kernel sources"
echo " --kernel-config= Kernel configuration file to use for compilation"
@@ -65,7 +66,7 @@ longusage() {
echo " autodetect."
echo " --makeopts= Make options such as -j2, etc..."
echo " --mountboot Mount BOOTDIR automatically if mountable"
- echo " --no-mountboot Don't mount BOOTDIR automatically"
+ echo " --no-mountboot Don't mount BOOTDIR automatically"
echo " --bootdir= Set the location of the boot-directory, default is /boot"
echo " Initialization"
echo " --gensplash= Enable framebuffer splash using "
@@ -374,6 +375,10 @@ parse_cmdline() {
CMD_INITRAMFS=1
print_info 2 "CMD_INITRAMFS: ${CMD_INITRAMFS}"
;;
+ --v86d)
+ CMD_V86D=1
+ print_info 2 "CMD_V86D: ${CMD_V86D}"
+ ;;
--tempdir=*)
TMPDIR=`parse_opt "$*"`
TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
diff -Naurp genkernel-orig/gen_initramfs.sh genkernel/gen_initramfs.sh
--- genkernel-orig/gen_initramfs.sh 2007-09-23 14:22:15.000000000 +0200
+++ genkernel/gen_initramfs.sh 2007-09-23 14:33:16.000000000 +0200
@@ -405,7 +405,15 @@ append_auxilary() {
chmod +x "${TEMP}/initramfs-aux-temp/sbin/modprobe"
cd "${TEMP}/initramfs-aux-temp/"
find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
- rm -r "${TEMP}/initramfs-aux-temp/"
+ rm -r "${TEMP}/initramfs-aux-temp/"
+}
+
+append_v86d() {
+ if [ -e /sbin/v86d ]; then
+ echo "/sbin/v86d" | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+ else
+ print_warning 1 ' >> No v86d detected; skipping!'
+ fi
}
append_data() {
@@ -436,7 +444,8 @@ create_initramfs() {
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'evms' "${EVMS}"
-
+ append_data 'v86d' "${CMD_V86D}"
+
if [ "${NOINITRDMODULES}" = '' ]
then
append_data 'modules'
diff -Naurp genkernel-orig/genkernel genkernel/genkernel
--- genkernel-orig/genkernel 2007-09-23 14:22:15.000000000 +0200
+++ genkernel/genkernel 2007-09-23 14:41:46.000000000 +0200
@@ -28,8 +28,7 @@ case "$*" in
--config=*)
CMD_GK_CONFIG=`parse_opt "$*"`
;;
- esac
-}
+esac
source ${CMD_GK_CONFIG:-/etc/genkernel.conf} || small_die "Could not read /etc/genkernel.conf"
@@ -392,7 +391,7 @@ then
echo
print_info 1 'WARNING... WARNING... WARNING...'
print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
- [ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
+ [ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use fbsplash ]"
[ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'
[ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'
[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'