Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=629c4dce519f10d0540e0b2375300757f1b633ec
commit 629c4dce519f10d0540e0b2375300757f1b633ec Author: Miklos Vajna <[email protected]> Date: Mon Dec 26 21:21:01 2011 +0100 Convert to the usual name-version-arch-type.iso output filename We're already using that for installer isos, no need to reinvent a different naming format here. diff --git a/bin/boot-qemu b/bin/boot-qemu index 232ddc5..3c4f999 100755 --- a/bin/boot-qemu +++ b/bin/boot-qemu @@ -8,4 +8,4 @@ if [ "$ARCH" = "x86_64" ]; then QEMU="qemu-system-x86_64" fi -$QEMU -enable-kvm -m $QEMUMEM -cdrom fwlive-$(cat $TREE/rootfs.version)-${APPSGROUP,,}-$ARCHBUILD.iso +$QEMU -enable-kvm -m $QEMUMEM -cdrom fwlive-$(cat $TREE/rootfs.version)-$ARCHBUILD-${APPSGROUP,,}.iso diff --git a/bin/create-iso b/bin/create-iso index af59c68..1c29e07 100755 --- a/bin/create-iso +++ b/bin/create-iso @@ -22,25 +22,25 @@ VERSION=$(cat $TREE/rootfs.version) cat >$TREE/iso/boot/syslinux/syslinux.cfg <<EOF timeout 100 ui vesamenu.c32 -menu title Frugalware $VERSION Live $GROUP +menu title Frugalware $VERSION $ARCHBUILD Live $GROUP menu background splash.png menu vshift 8 menu margin 0 label frugalware - menu label Frugalware $VERSION $GROUP Live + menu label Frugalware $VERSION $ARCHBUILD Live $GROUP linux /boot/vmlinuz initrd /boot/initrd append root=live:CDLABEL=fwlive rd.plymouth=0 label frugalwareinram - menu label Frugalware $VERSION $GROUP Live ( Copy to RAM ) + menu label Frugalware $VERSION $ARCHBUILD Live $GROUP (Copy to RAM) linux /boot/vmlinuz initrd /boot/initrd append root=live:CDLABEL=fwlive rd.plymouth=0 rd.live.ram=1 EOF mkdir -p $TREE/iso/LiveOS cp -v $TREE/squashfs.img $TREE/iso/LiveOS/squashfs.img -mkisofs -R -J -V fwlive -b boot/syslinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -o fwlive-$VERSION-$GROUPLOW-$ARCHBUILD.iso $TREE/iso -isohybrid fwlive-$VERSION-$GROUPLOW-$ARCHBUILD.iso +mkisofs -R -J -V fwlive -b boot/syslinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -o fwlive-$VERSION-$ARCHBUILD-$GROUPLOW.iso $TREE/iso +isohybrid fwlive-$VERSION-$ARCHBUILD-$GROUPLOW.iso _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
