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

test-cd: sync extlinux changes with livecd

Browse Source
This commit is contained in:
Silvan Calarco 2011-10-30 16:51:41 +01:00
parent 2abfb2528e
commit eddd587c0f
3 changed files with 72 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,6 @@ sed -i -e '/^halt .*/i \
sed -i -e '/^reboot .*/i \ sed -i -e '/^reboot .*/i \
/sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot /sbin/eject_cd.sh 2>&1 >/dev/null' $MOUNTDIR/etc/init.d/reboot
# configure favorites in kde menu # configure favorites in kde menu
for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f

8
platforms/testcd-root/post.inc.sh
View File

@ -64,4 +64,12 @@ rm -f $MOUNTDIR/tmp/sounddb.sh
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
# remove failsafe image to save space for livecd
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
# remove some documentation to save space on CD
for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \;
done
prelink prelink

86
platforms/testcd/post.inc.sh
View File

@ -7,20 +7,24 @@
[ -e $MOUNTDIR2/boot/isolinux ] || mkdir -p $MOUNTDIR2/boot/isolinux [ -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 \ 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 \
/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \ /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
${KERNEL_MAJVER}${KERNEL_EXTRAVER} ${KERNEL_MAJVER}${K}
# Note: isolinux requires 8.3 filenames # Note: isolinux requires 8.3 filenames
cp $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \ cp $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
$MOUNTDIR2/boot/initrmfs.gz $MOUNTDIR2/boot/initrd${ISOID}.gz
cp $MOUNTDIR/boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} \ cp $MOUNTDIR/boot/vmlinuz-${KERNEL_MAJVER}${K} \
$MOUNTDIR2/boot/vmlinuz $MOUNTDIR2/boot/vmlinuz${ISOID}
ISOID=$(($ISOID + 1))
done
# add buildinfo # add buildinfo
buildinfo="`cat $MOUNTDIR/etc/openmamba-release` ${PLATFORM}" buildinfo="`cat $MOUNTDIR/etc/openmamba-release` ${PLATFORM}"
@ -30,26 +34,58 @@ cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF
PROMPT 0 PROMPT 0
TIMEOUT 20 TIMEOUT 20
DEFAULT vesamenu.c32 DEFAULT vesamenu.c32
MENU TITLE ${buildinfo} (${KERNEL_MAJVER}${KERNEL_EXTRAVER} kernel) MENU TITLE ${buildinfo} (${KERNEL_MAJVER} kernel)
MENU BACKGROUND openmamba.png MENU BACKGROUND openmamba.png
MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std
_EOF
LABEL kms ISOID=
MENU LABEL default for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
kernel /boot/vmlinuz cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF
append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 LABEL default-${KERNEL_MAJVER}${K}
LABEL vga1024 MENU LABEL default (${KERNEL_MAJVER}${K})
MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz${ISOID}
kernel /boot/vmlinuz append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792
append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 nomodeset _EOF
LABEL vga800 ISOID=$(($ISOID + 1))
MENU LABEL VGA 800x600 (no modeset) done
kernel /boot/vmlinuz
append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 nomodeset echo "MENU SEPARATOR" >> $MOUNTDIR2/boot/isolinux/isolinux.cfg
LABEL debug ISOID=
MENU LABEL Debug mode for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
kernel /boot/vmlinuz cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF
append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset 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" >> $MOUNTDIR2/boot/isolinux/isolinux.cfg
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 MENU SEPARATOR
LABEL memtest LABEL memtest
MENU LABEL Memory test MENU LABEL Memory test