diff --git a/platforms/livecd-gnome-root/Makefile.defs b/platforms/livecd-gnome-root/Makefile.defs index 3e372c3..1a02277 100644 --- a/platforms/livecd-gnome-root/Makefile.defs +++ b/platforms/livecd-gnome-root/Makefile.defs @@ -1,7 +1,3 @@ packagekitgui = gnome-packagekit firewallgui = gui-ufw -ifeq ($(ARCH),x86_64) -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest -else xorgdrvvideo += xorg-drv-video-vboxvideo -endif diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index 74293eb..252b60d 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -18,18 +18,19 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found clean_rpm_database -# pre-create video drivers for VirtualBox -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force -done -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +## pre-create video drivers for VirtualBox +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +#done +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +# +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# # remove kernel headers installed by dkms +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y +#done -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - # remove kernel headers installed by dkms - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y -done # remove unused initramfs generated by kernel for f in $MOUNTDIR/boot/initramfs-*.img*; do case "$f" in diff --git a/platforms/livecd-light-root/Makefile.defs b/platforms/livecd-light-root/Makefile.defs index 3e372c3..1a02277 100644 --- a/platforms/livecd-light-root/Makefile.defs +++ b/platforms/livecd-light-root/Makefile.defs @@ -1,7 +1,3 @@ packagekitgui = gnome-packagekit firewallgui = gui-ufw -ifeq ($(ARCH),x86_64) -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest -else xorgdrvvideo += xorg-drv-video-vboxvideo -endif diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 1868f49..2c518db 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -11,18 +11,19 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found clean_rpm_database -# pre-create video drivers for VirtualBox -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force -done -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +## pre-create video drivers for VirtualBox +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +#done +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +# +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# # remove kernel headers installed by dkms +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y +#done -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - # remove kernel headers installed by dkms - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y -done # remove unused initramfs generated by kernel for f in $MOUNTDIR/boot/initramfs-*.img*; do case "$f" in diff --git a/platforms/livecd-root/Makefile.defs b/platforms/livecd-root/Makefile.defs index 07fcb68..53b3a6c 100644 --- a/platforms/livecd-root/Makefile.defs +++ b/platforms/livecd-root/Makefile.defs @@ -1,6 +1,2 @@ networkmanagergui = plasma-nm -ifeq ($(ARCH),x86_64) -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest -else xorgdrvvideo += xorg-drv-video-vboxvideo -endif diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 39be6dc..cacac5b 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -16,18 +16,19 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found clean_rpm_database -# pre-create video drivers for VirtualBox -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force -done -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +## pre-create video drivers for VirtualBox +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +#done +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +# +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# # remove kernel headers installed by dkms +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y +#done -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - # remove kernel headers installed by dkms - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y -done # remove unused initramfs generated by kernel for f in $MOUNTDIR/boot/initramfs-*.img*; do case "$f" in diff --git a/platforms/livedvd-root/Makefile.defs b/platforms/livedvd-root/Makefile.defs index 37bbd68..15bcdde 100644 --- a/platforms/livedvd-root/Makefile.defs +++ b/platforms/livedvd-root/Makefile.defs @@ -1,6 +1,2 @@ networkmanagergui = plasma-applet-networkmanagement -ifeq ($(ARCH),x86_64) -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest -else xorgdrvvideo += xorg-drv-video-vboxvideo -endif diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 4ed0e6b..9ad413f 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -16,13 +16,14 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found clean_rpm_database -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do - # pre-create video drivers for VirtualBox - chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force - done -done +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do +# # pre-create video drivers for VirtualBox +# chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +# done +#done + # remove unused initramfs generated by kernel for f in $MOUNTDIR/boot/initramfs-*.img*; do case "$f" in diff --git a/platforms/testcd-root/Makefile.defs b/platforms/testcd-root/Makefile.defs index 37bbd68..15bcdde 100644 --- a/platforms/testcd-root/Makefile.defs +++ b/platforms/testcd-root/Makefile.defs @@ -1,6 +1,2 @@ networkmanagergui = plasma-applet-networkmanagement -ifeq ($(ARCH),x86_64) -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest -else xorgdrvvideo += xorg-drv-video-vboxvideo -endif diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 6ef3db7..e037cac 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -6,18 +6,19 @@ chroot $MOUNTDIR update-alternatives-set-dri # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f #done -# pre-create video drivers for VirtualBox -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force -done -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +## pre-create video drivers for VirtualBox +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force +#done +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts +# +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do +# # remove kernel headers installed by dkms +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y +#done -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - # remove kernel headers installed by dkms - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y -done # remove unused initramfs generated by kernel for f in $MOUNTDIR/boot/initramfs-*.img* do case "$f" in