# HG changeset patch # User Pascal Bellard # Date 1329208292 -3600 # Node ID aa2575df3a5b262fdd9311b89c9ce4661d5a2e7f # Parent e6839ebfb5c74d0c2f1b785b5226cce98d46211e tazlito/meta: add vesamenu support diff -r e6839ebfb5c7 -r aa2575df3a5b tazlito --- a/tazlito Sun Feb 12 15:01:28 2012 +0100 +++ b/tazlito Tue Feb 14 09:31:32 2012 +0100 @@ -276,10 +276,10 @@ exit 0 fi # Set date for boot msg. - if grep -q 'XXXXXXXX' $ROOTCD/boot/isolinux/isolinux.cfg; then + if grep -q 'XXXXXXXX' $ROOTCD/boot/isolinux/isolinux.*g; then DATE=`date +%Y%m%d` echo -n "Setting build date to: $DATE..." - sed -i s/'XXXXXXXX'/"$DATE"/ $ROOTCD/boot/isolinux/isolinux.cfg + sed -i "s/XXXXXXXX/$DATE/" $ROOTCD/boot/isolinux/isolinux.*g status fi cd $ROOTCD @@ -575,9 +575,10 @@ # Update isolinux config files for multiple rootfs update_bootconfig() { + local files echo -n "Updating boot config files..." - grep -l 'include common' $1/*.cfg | \ - while read file ; do + files="$(grep -l 'include common' $1/*.cfg)" + echo $files | while read file ; do awk -v n=$(echo $2 | awk '{ print NF/2 }') '{ if (/label/) label=$0; else if (/kernel/) kernel=$0; @@ -602,20 +603,61 @@ }' < $file > $file.$$ mv -f $file.$$ $file done + sel="$(echo $2 | awk '{ + for (i=1; i<=NF; i++) + if (i % 2 == 0) printf " slitaz%d",i/2 + else printf " %s",$i +}')" cat >> $1/common.cfg <= i; j--) { + initrd=initrd ",/boot/rootfs" j ".gz"; + } + printf "\tappend %s%s\n",initrd,append; + print ""; + } +} +else print; +}' < $1/isolinux.cfg > $1/isolinux.cfg.$$ + mv $1/isolinux.cfg.$$ $1/isolinux.cfg + fi cat > $1/noram.cfg <1; i-=2) printf "%d/%s\n",i/2,$i }' | \ while read pat; do - sed -i "s/slitaz$pat/" $1/common.cfg \ - $(grep -l 'include common' $1/*.cfg) + sed -i "s/slitaz$pat/" $1/common.cfg $files done status } @@ -2131,7 +2172,7 @@ status fi # Isolinux msg - if grep -q "cooking-XXXXXXXX" /$ROOTCD/boot/isolinux/isolinux.msg; then + if grep -q "cooking-XXXXXXXX" /$ROOTCD/boot/isolinux/isolinux.*g; then echo -n "Isolinux msg : Missing cooking date XXXXXXXX (ex `date +%Y%m%d`)" todomsg else