diff --git a/Makefile.defs b/Makefile.defs index 439e6dd..9ccac91 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -30,7 +30,8 @@ libGLcore.so.1 = xorg-drv-video-nvidia # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx libnvidia-tls.so.1 = xorg-drv-video-nvidia # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx -xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau xorg-drv-video-vboxvideo +xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau +# xorg-drv-video-vboxvideo # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-vboxmouse xorg-drv-input-evdev # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh index 2206373..969c10f 100644 --- a/platforms/bootusb/post.inc.sh +++ b/platforms/bootusb/post.inc.sh @@ -27,7 +27,7 @@ MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std LABEL kms MENU LABEL default kernel /boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} - append initrd=/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz root=live:/openmamba_live/openmamba-live.iso ro selinux=0 quiet splash vga=789 + append initrd=/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz root=live:/openmamba_live/openmamba-live.iso ro selinux=0 quiet splash vga=792 LABEL vga1024 MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh index fc37b66..20b1914 100644 --- a/platforms/livecd/post.inc.sh +++ b/platforms/livecd/post.inc.sh @@ -37,7 +37,7 @@ MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std LABEL kms MENU LABEL default kernel /boot/vmlinuz - append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 + append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 LABEL vga1024 MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh index 9965060..d463028 100644 --- a/platforms/livedvd/post.inc.sh +++ b/platforms/livedvd/post.inc.sh @@ -37,7 +37,7 @@ MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std LABEL kms MENU LABEL default kernel /boot/vmlinuz - append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 + append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 LABEL vga1024 MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz diff --git a/platforms/sdk-root/post.inc.sh b/platforms/sdk-root/post.inc.sh index 83aaa11..777d93c 100644 --- a/platforms/sdk-root/post.inc.sh +++ b/platforms/sdk-root/post.inc.sh @@ -82,17 +82,19 @@ esac echo $timezone > $MOUNTDIR/etc/timezone cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime -# update module dependencies -chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} +if [ ! "$KERNEL_IGNORE" ]; then + # update module dependencies + chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} -# create universal initramfs -LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ - --filesystems "ext3 ext4 reiserfs reiser4" \ - --nomdadmconf --nolvmconf \ - /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \ - ${KERNEL_MAJVER}${KERNEL_EXTRAVER} + # create universal initramfs + LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ + --filesystems "ext3 ext4 reiserfs reiser4" \ + --nomdadmconf --nolvmconf \ + /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \ + ${KERNEL_MAJVER}${KERNEL_EXTRAVER} +fi # don't remove static qemu for this platform QEMU_COPIED_FOR_INST=0 -prelink +#prelink