diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 3a80b32..1a6b496 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -56,13 +56,15 @@ for f in /usr/share/applications/chromium-devel.desktop \ done # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh -chroot $MOUNTDIR sh /tmp/sounddb.sh -rm -f $MOUNTDIR/tmp/sounddb.sh -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do + [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${K} $MOUNTDIR/lib/modules/`uname -r` + echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh + chroot $MOUNTDIR sh /tmp/sounddb.sh + rm -f $MOUNTDIR/tmp/sounddb.sh + [ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` -# remove unused initramfs generated by kernel -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img* + # remove unused initramfs generated by kernel + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* +done prelink diff --git a/platforms/livedvd-root/settings.inc b/platforms/livedvd-root/settings.inc index 73549fa..561ba4f 100644 --- a/platforms/livedvd-root/settings.inc +++ b/platforms/livedvd-root/settings.inc @@ -6,6 +6,8 @@ KERNEL_EXTRAVER=mamba KERNEL_PLATFORM="" #KERNEL_ADDITIONAL="extramodules sound" +KERNEL_MORE_EXTRAVER=mamba-64GB + TARGET_HOSTNAME=openmamba-livedvd ROOTDEV= ROOTFS= diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh index d463028..2f6cc89 100644 --- a/platforms/livedvd/post.inc.sh +++ b/platforms/livedvd/post.inc.sh @@ -7,20 +7,24 @@ [ -e $MOUNTDIR2/boot/isolinux ] || mkdir -p $MOUNTDIR2/boot/isolinux -chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} +ISOID= +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do + chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K} + LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ + --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ + --nomdadmconf --nolvmconf \ + /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \ + ${KERNEL_MAJVER}${K} -LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ - --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ - --nomdadmconf --nolvmconf \ - /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \ - ${KERNEL_MAJVER}${KERNEL_EXTRAVER} + # Note: isolinux requires 8.3 filenames + cp $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \ + $MOUNTDIR2/boot/initrd${ISOID}.gz -# Note: isolinux requires 8.3 filenames -cp $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \ - $MOUNTDIR2/boot/initrmfs.gz + cp $MOUNTDIR/boot/vmlinuz-${KERNEL_MAJVER}${K} \ + $MOUNTDIR2/boot/vmlinuz${ISOID} -cp $MOUNTDIR/boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} \ - $MOUNTDIR2/boot/vmlinuz + ISOID=$(($ISOID + 1)) +done # add buildinfo buildinfo="`cat $MOUNTDIR/etc/openmamba-release` ${PLATFORM}" @@ -30,26 +34,58 @@ cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF PROMPT 0 TIMEOUT 20 DEFAULT vesamenu.c32 -MENU TITLE ${buildinfo} (${KERNEL_MAJVER}${KERNEL_EXTRAVER} kernel) +MENU TITLE ${buildinfo} (${KERNEL_MAJVER} kernel) MENU BACKGROUND openmamba.png MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std +_EOF -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=792 -LABEL vga1024 -MENU LABEL VGA 1024x768 (no modeset) - kernel /boot/vmlinuz - append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 nomodeset -LABEL vga800 -MENU LABEL VGA 800x600 (no modeset) - kernel /boot/vmlinuz - append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 nomodeset -LABEL debug -MENU LABEL Debug mode - kernel /boot/vmlinuz - append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset +ISOID= +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do + cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF +LABEL default-${KERNEL_MAJVER}${K} +MENU LABEL default (${KERNEL_MAJVER}${K}) + kernel /boot/vmlinuz${ISOID} + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 +_EOF + ISOID=$(($ISOID + 1)) +done + +echo "MENU SEPARATOR" >> $MOUNTDIR/boot/extlinux.conf +ISOID= +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do + cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF +LABEL vga800-${KERNEL_MAJVER}${K} +MENU LABEL VGA 800x600 no modeset (${KERNEL_MAJVER}${K}) + kernel /boot/vmlinuz${ISOID} + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 nomodeset +_EOF + ISOID=$(($ISOID + 1)) +done + +ISOID= +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do + cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF +LABEL vga1024-${KERNEL_MAJVER}${K} +MENU LABEL VGA 1024x768 no modeset (${KERNEL_MAJVER}${K}) + kernel /boot/vmlinuz${ISOID} + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 nomodeset +_EOF + ISOID=$(($ISOID + 1)) +done + +echo "MENU SEPARATOR" >> $MOUNTDIR/boot/extlinux.conf +ISOID= +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do + cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF +LABEL debug-${KERNEL_MAJVER}${K} +MENU LABEL Debug mode (${KERNEL_MAJVER}${K}) + kernel /boot/vmlinuz${ISOID} + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset +_EOF + ISOID=$(($ISOID + 1)) +done + +cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF MENU SEPARATOR LABEL memtest MENU LABEL Memory test diff --git a/platforms/livedvd/settings.inc b/platforms/livedvd/settings.inc index 4dbc884..7912a70 100644 --- a/platforms/livedvd/settings.inc +++ b/platforms/livedvd/settings.inc @@ -4,6 +4,9 @@ DISTROMATIC=off KERNEL_EXTRAVER=mamba KERNEL_PLATFORM="" #KERNEL_ADDITIONAL="extramodules" + +KERNEL_MORE_EXTRAVER=mamba-64GB + [ "$SUBPLATFORM" ] || { SUBPLATFORM="livedvd-root" PRODUCT_NAME="livedvd"