openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport from openmamba (devel): nouveau support and squashfs xz compression (kernel 2.6.38)

Browse Source
This commit is contained in:
Silvan Calarco 2011-07-22 16:31:38 +02:00
parent 309a9da2fa
commit fb5cf9d5f0
10 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/bootusb/post.inc.sh
View File

@ -1,9 +1,5 @@
# make initramfs # make initramfs
# temporary workaround to disable nouveau driver in favour of nvidia proprietary until
# it gets 3D support
echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf
chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
## FIXME: ONLY FOR TEST; REMOVE THE FOLLOWING LINE! ## FIXME: ONLY FOR TEST; REMOVE THE FOLLOWING LINE!

4
platforms/livecd-root/post.inc.sh
View File

@ -3,10 +3,6 @@
#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} #rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} #rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
# temporary workaround to disable nouveau driver in favour of nvidia proprietary until
# it gets 3D support
echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf
# change inittab so it opens tty root shells instead of asking for login # change inittab so it opens tty root shells instead of asking for login
# #
echo "Forcing \`inittab' to open tty root shells with no login..." echo "Forcing \`inittab' to open tty root shells with no login..."

2
platforms/livecd-root/settings.inc
View File

@ -1,5 +1,5 @@
PRODUCT_NAME=livecd PRODUCT_NAME=livecd
MEDIA=squash_lzma MEDIA=squash_xz
MULTITHREAD=1 MULTITHREAD=1
KERNEL_EXTRAVER=mamba KERNEL_EXTRAVER=mamba

4
platforms/livecd/post.inc.sh
View File

@ -9,10 +9,6 @@
chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
# temporary workaround to disable nouveau driver in favour of nvidia proprietary until
# it gets 3D support
echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf
LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
--filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \
--nomdadmconf --nolvmconf \ --nomdadmconf --nolvmconf \

4
platforms/livedvd-root/post.inc.sh
View File

@ -3,10 +3,6 @@
#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} #rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} #rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
# temporary workaround to disable nouveau driver in favour of nvidia proprietary until
# it gets 3D support
echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf
# change inittab so it opens tty root shells instead of asking for login # change inittab so it opens tty root shells instead of asking for login
# #
echo "Forcing \`inittab' to open tty root shells with no login..." echo "Forcing \`inittab' to open tty root shells with no login..."

2
platforms/livedvd-root/settings.inc
View File

@ -1,5 +1,5 @@
PRODUCT_NAME=livedvd PRODUCT_NAME=livedvd
MEDIA=squash_lzma MEDIA=squash_xz
MULTITHREAD=1 MULTITHREAD=1
KERNEL_EXTRAVER=mamba KERNEL_EXTRAVER=mamba

4
platforms/livedvd/post.inc.sh
View File

@ -9,10 +9,6 @@
chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
# temporary workaround to disable nouveau driver in favour of nvidia proprietary until
# it gets 3D support
echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf
LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
--filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \
--nomdadmconf --nolvmconf \ --nomdadmconf --nolvmconf \

21
platforms/livedvd/root/boot/isolinux/help.txt
View File

@ -2,20 +2,19 @@
openmamba CD boot menu openmamba CD boot menu
====================== ======================
1) System startup at 800x600 resolution (default choice) kms) Autodetect startup video mode (default choice)
2) System startup at 1024x768 resolution vga1024) Force system startup at 1024x768 resolution
3) System startup at 1280x1024 resolution vga800) Force system startup at 1280x1024 resolution
1-freevideo,2-freevideo,3-freevideo) like 1,2,3 + Open Source video drivers
8) System startup in debug mode debug) System startup in debug mode
9) Start a system memory benchmark memtest) Start a system memory benchmark
Please, enter 1 or wait 10 seconds to boot automatically. Please, enter your choice or wait 10 seconds to boot automatically.
You can also pass some extra parameters to the kernel. For example: You can also pass some extra parameters to the kernel. For example:
boot: 1 debug=1 video=uvesafb:off postplug=nosound,freevideo boot: kms debug=1 splash=off postplug=nosound,freevideo
If you have trouble booting the system please use the choice '8' or the If you have trouble booting the system please use the choice 'debug' or the
debug=1 and vga=normal options in order to see system messages. debug=1 and splash=off options in order to see system messages.
NOTE: In most cases you just need to hit ENTER to boot with default settings. NOTE: In most cases you just need to hit ENTER to boot with default settings.

4
platforms/livegames-root/post.inc.sh
View File

@ -3,10 +3,6 @@
#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} #rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} #rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
# temporary workaround to disable nouveau driver in favour of nvidia proprietary until
# it gets 3D support
echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf
# change inittab so it opens tty root shells instead of asking for login # change inittab so it opens tty root shells instead of asking for login
# #
echo "Forcing \`inittab' to open tty root shells with no login..." echo "Forcing \`inittab' to open tty root shells with no login..."

2
platforms/livegames-root/settings.inc
View File

@ -1,4 +1,4 @@
MEDIA=squash_lzma MEDIA=squash_xz
MULTITHREAD=1 MULTITHREAD=1
PRODUCT_NAME=livegames PRODUCT_NAME=livegames