Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=97cc7356c9f6be0c32ebeca312cd558882947a0a
commit 97cc7356c9f6be0c32ebeca312cd558882947a0a Author: Miklos Vajna <[email protected]> Date: Mon Dec 26 21:09:35 2011 +0100 include version in iso name diff --git a/TODO b/TODO index 81187b4..2a79f19 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -- detect version in boot menu after next frugalware pkg - make a symlink of /usr/share/applications/fwife.desktop in /home/fwlive/Desktop/ - make a symlink of /usr/share/applications/Frugalware-Homepage.desktop in /home/fwlive/Desktop/ - make a symlink of /usr/share/applications/Frugalware-Forums.desktop in /home/fwlive/Desktop/ diff --git a/bin/boot-qemu b/bin/boot-qemu index 6c01ed1..232ddc5 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-${APPSGROUP,,}-$ARCHBUILD.iso +$QEMU -enable-kvm -m $QEMUMEM -cdrom fwlive-$(cat $TREE/rootfs.version)-${APPSGROUP,,}-$ARCHBUILD.iso diff --git a/bin/create-iso b/bin/create-iso index f09ba2d..af59c68 100755 --- a/bin/create-iso +++ b/bin/create-iso @@ -18,28 +18,29 @@ cp -vf $TREE/initrd.img.xz $TREE/iso/boot/initrd GROUP=`echo $(echo $APPSGROUP | cut -c1)$(echo $APPSGROUP | cut -c2- | tr [A-Z] [a-z])` ## Real lowercase GROUPLOW=${APPSGROUP,,} +VERSION=$(cat $TREE/rootfs.version) cat >$TREE/iso/boot/syslinux/syslinux.cfg <<EOF timeout 100 ui vesamenu.c32 -menu title Frugalware Live $GROUP +menu title Frugalware $VERSION Live $GROUP menu background splash.png menu vshift 8 menu margin 0 label frugalware - menu label Frugalware-$GROUP Live + menu label Frugalware $VERSION $GROUP Live linux /boot/vmlinuz initrd /boot/initrd append root=live:CDLABEL=fwlive rd.plymouth=0 label frugalwareinram - menu label Frugalware-$GROUP Live ( Copy to RAM ) + menu label Frugalware $VERSION $GROUP Live ( 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-$GROUPLOW-$ARCHBUILD.iso $TREE/iso -isohybrid fwlive-$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-$GROUPLOW-$ARCHBUILD.iso $TREE/iso +isohybrid fwlive-$VERSION-$GROUPLOW-$ARCHBUILD.iso diff --git a/bin/create-rootfs b/bin/create-rootfs index 8197164..be90083 100755 --- a/bin/create-rootfs +++ b/bin/create-rootfs @@ -113,6 +113,7 @@ pacman-g2 -Sy $PACKAGES -r "$CHROOTDIR" --noconfirm --config pacman-g2.conf $EXT pacman -Syf kernel -r "$CHROOTDIR" --noconfirm --config pacman-g2.conf $EXTRAOPTS # Post-install tweaks +chroot $CHROOTDIR sh /etc/pacman-g2/hooks/update-frugalware-version post_sysupgrade # update /etc/frugalware-release chroot $CHROOTDIR sh -c "echo 'root:$ROOTPASS' | chpasswd" if [ -n "$USERNAME" -a -n "$USERPASS" ]; then yes ''|chroot $CHROOTDIR /usr/sbin/adduser "$USERNAME" "Fwlive User" "$USERPASS" "/home/$USERNAME" @@ -196,6 +197,9 @@ cp -vf $CHROOTDIR/boot/vmlinuz $TREE/vmlinuz cp -vf $CHROOTDIR/boot/initrd.img.xz $TREE/initrd.img.xz rm -rf $CHROOTDIR/boot/* +# Save version +sed "s/.* \(.*\) (.*/\1/" $CHROOTDIR/etc/frugalware-release > $TREE/rootfs.version + # Umount chroot echo "Attempting to umount chroot directories..." umount $CHROOTDIR/proc >/dev/null _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
