Hello community, here is the log from the commit of package live-fat-stick for openSUSE:Factory checked in at 2018-02-10 18:00:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live-fat-stick (Old) and /work/SRC/openSUSE:Factory/.live-fat-stick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "live-fat-stick" Sat Feb 10 18:00:08 2018 rev:10 rq:574938 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/live-fat-stick/live-fat-stick.changes 2017-06-26 15:53:47.786689630 +0200 +++ /work/SRC/openSUSE:Factory/.live-fat-stick.new/live-fat-stick.changes 2018-02-10 18:00:10.139784271 +0100 @@ -1,0 +2,7 @@ +Sat Feb 3 07:17:38 UTC 2018 - [email protected] + +- Remove fuseios requirement +- Support for ix86 arch on openSUSE +- Support new kiwi-live for newer openSUSE images + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live-fat-stick.spec ++++++ --- /var/tmp/diff_new_pack.R4Z8fY/_old 2018-02-10 18:00:11.791724470 +0100 +++ /var/tmp/diff_new_pack.R4Z8fY/_new 2018-02-10 18:00:11.799724180 +0100 @@ -28,7 +28,6 @@ Source2: live-usb-gui.desktop Source3: live-grub-stick Requires: dd_rescue -Requires: fuseiso Requires: parted Requires: syslinux Requires: util-linux @@ -77,7 +76,6 @@ %package -n live-grub-stick Requires: dd_rescue -Requires: fuseiso Requires: grub2 Requires: parted Requires: util-linux ++++++ live-fat-stick ++++++ --- /var/tmp/diff_new_pack.R4Z8fY/_old 2018-02-10 18:00:11.827723167 +0100 +++ /var/tmp/diff_new_pack.R4Z8fY/_new 2018-02-10 18:00:11.827723167 +0100 @@ -75,7 +75,7 @@ Note2: Install 32bit/x86 iso on the stick first if creating multiboot with both x86 and x86_64 arch images. - Note3: Requires: syslinux, fuseiso and dd_rescue/ddrescue installed on the system running this. + Note3: Requires: syslinux and dd_rescue/ddrescue installed on the system running this. Run this command as root (su -, not sudo) live-fat-stick isopath stickpartition @@ -99,7 +99,7 @@ The stick partition has to be vfat/fat32 format if the image is not isohybrid. Persistent option requires minimum 500M free space on the USB device apart from the spare needed by iso image. - To allocate more space for cow file use cowfile variable like this example: "export cowfile=1000M" before running the script + To allocate more space for cow file use cowsize variable like this example: "export cowsize=1000M" before running the script Please note that using isohybrid option will remove all existing data on the USB device and create new partitions. @@ -176,10 +176,6 @@ echo "syslinux not found, please install syslinux package" exit 1 fi -if [[ ! -e /usr/bin/fuseiso ]]; then - echo "fuseiso not found, please install fuseiso package" - exit 1 -fi if [[ ! -e $(which qemu-img) ]]; then echo "qemu-img not found, please install qemu-tools package" exit 1 @@ -255,7 +251,7 @@ fi } copy_kernel_initrd () { - fuseiso $isopath $isomount &>/dev/null + mount -o loop $isopath $isomount &>/dev/null echo "copying kernel and initrd from iso image to $stickdevpart" if [[ $distroname == suse ]]; then if [[ $PERSISTENT_IMAGE == true ]]; then @@ -275,20 +271,30 @@ fi cp $isomount/boot/*/loader/linux $syslinuxpath/linux-$isonameshort cp $isomount/boot/*/loader/initrd $syslinuxpath/initrd-$isonameshort - appendsection="append initrd=initrd-$isonameshort isofrom=/dev/disk/by-uuid/$stickuuid:/$isoname isofrom_device=/dev/disk/by-uuid/$stickuuid isofrom_system=/$isoname loader=syslinux splash=silent $persistopts quiet showopts" + if [[ -e $isomount/boot/x86_64/loader/linux ]]; then + isoarch=x86_64 + else + isoarch=ix86 + fi + if [[ -e $isomount/LiveOS/squashfs.img ]]; then + appendsection="append initrd=initrd-$isonameshort iso-scan/filename=/$isoname root=live:CDLABEL=$isolabel loader=syslinux splash=silent $persistopts quiet showopts" + else + appendsection="append initrd=initrd-$isonameshort isofrom=/dev/disk/by-uuid/$stickuuid:/$isoname isofrom_device=/dev/disk/by-uuid/$stickuuid isofrom_system=/$isoname loader=syslinux splash=silent $persistopts quiet showopts" + fi isolinux_msg="display isolinux.msg" ui="ui gfxboot bootlogo isolinux.msg" fi if [[ $distroname == ubuntu ]]; then if [[ $PERSISTENT_IMAGE == true ]]; then - mkdir -p $stickmount/$isonameshort + cowfolder=$isonameshort-cow + mkdir -p $stickmount/$cowfolder echo "Creating image file for persistent data" - if ! qemu-img create $stickmount/$isonameshort/casper-rw $cowsize &>/dev/null;then + if ! qemu-img create $stickmount/$cowfolder/casper-rw $cowsize &>/dev/null;then echo "Can't create cow file" else - echo "Creating filesystem for persistent data" - mkfs.ext4 -F -O^has_journal -L casper-rw $stickmount/$isonameshort/casper-rw - persistopts="persistent persistent-path=/$isonameshort/" + echo "Creating filesystem for persistent data" + mkfs.ext4 -F -O^has_journal -L casper-rw $stickmount/$cowfolder/casper-rw + persistopts="persistent persistent-path=/$cowfolder/" fi fi mkdir -p $syslinuxpath ++++++ live-grub-stick ++++++ --- /var/tmp/diff_new_pack.R4Z8fY/_old 2018-02-10 18:00:11.843722587 +0100 +++ /var/tmp/diff_new_pack.R4Z8fY/_new 2018-02-10 18:00:11.843722587 +0100 @@ -73,7 +73,7 @@ Note2: Install 32bit/x86 iso on the stick first if creating multiboot with both x86 and x86_64 arch images. - Note3: Requires: grub2, fuseiso and dd_rescue/ddrescue installed on the system running this. + Note3: Requires: grub2 and dd_rescue/ddrescue installed on the system running this. Run this command as root (su -, not sudo) live-grub-stick isopath stickpartition @@ -100,7 +100,7 @@ The stick partition has to be vfat/fat32 format if the image is not isohybrid. Persistent option requires minimum 500M free space on the USB device apart from the spare needed by iso image. - To allocate more space for cow file use cowfile variable like this example: "export cowfile=1000M" before running the script + To allocate more space for cow file use cowsize variable like this example: "export cowsize=1000M" before running the script Please note that using isohybrid option will remove all existing data on the USB device and create new partitions. @@ -186,10 +186,6 @@ echo "$grubinstall command not found, please install grub2 package" exit 1 fi -if [[ ! -e $(which fuseiso) ]]; then - echo "fuseiso not found, please install fuseiso package" - exit 1 -fi if [[ ! -e $1 ]]; then echo "File $1 does not exist" exit 1 @@ -261,7 +257,7 @@ fi } cfg_setup() { - fuseiso $isopath $isomount &>/dev/null + mount -o loop $isopath $isomount &>/dev/null if [[ -d $stickmount/boot/grub2 ]]; then grub2path=$stickmount/boot/grub2 grub2pathrealusb=/boot/grub2 @@ -289,19 +285,29 @@ persistopts="kiwi_cowdevice=/dev/disk/by-uuid/$stickuuid kiwi_cowsystem=/boot/$isonameshort-cowfile" fi fi - appendsection="\$linux (loop)/boot/x86_64/loader/linux isofrom=/dev/disk/by-uuid/$stickuuid:/$isoname isofrom_device=/dev/disk/by-uuid/$stickuuid isofrom_system=/$isoname $persistopts install=hd:/$isoname loader=syslinux splash=silent quiet showopts" - appendsection2="\$initrd (loop)/boot/x86_64/loader/initrd" + if [[ -e $isomount/boot/x86_64/loader/linux ]]; then + isoarch=x86_64 + else + isoarch=ix86 + fi + if [[ -e $isomount/LiveOS/squashfs.img ]]; then + appendsection="\$linux (loop)/boot/$isoarch/loader/linux iso-scan/filename=/$isoname root=live:CDLABEL=$isolabel $persistopts install=hd:/$isoname loader=syslinux splash=silent quiet showopts" + else + appendsection="\$linux (loop)/boot/$isoarch/loader/linux isofrom=/dev/disk/by-uuid/$stickuuid:/$isoname isofrom_device=/dev/disk/by-uuid/$stickuuid isofrom_system=/$isoname $persistopts install=hd:/$isoname loader=syslinux splash=silent quiet showopts" + fi + appendsection2="\$initrd (loop)/boot/$isoarch/loader/initrd" fi if [[ $distroname == ubuntu ]]; then if [[ $PERSISTENT_IMAGE == true ]]; then - mkdir -p $stickmount/$isonameshort + cowfolder=$isonameshort-cow + mkdir -p $stickmount/$cowfolder echo "Creating image file for persistent data" - if ! qemu-img create $stickmount/$isonameshort/casper-rw $cowsize &>/dev/null;then + if ! qemu-img create $stickmount/$cowfolder/casper-rw $cowsize &>/dev/null;then echo "Can't create cow file" else - echo "Creating filesystem for persistent data" - mkfs.ext4 -F -O^has_journal -L casper-rw $stickmount/$isonameshort/casper-rw - persistopts="persistent persistent-path=/$isonameshort/" + echo "Creating filesystem for persistent data" + mkfs.ext4 -F -O^has_journal -L casper-rw $stickmount/$cowfolder/casper-rw + persistopts="persistent persistent-path=/$cowfolder/" fi fi if [[ -e $isomount/casper/vmlinuz ]]; then ++++++ live-usb-gui ++++++ --- /var/tmp/diff_new_pack.R4Z8fY/_old 2018-02-10 18:00:11.859722008 +0100 +++ /var/tmp/diff_new_pack.R4Z8fY/_new 2018-02-10 18:00:11.859722008 +0100 @@ -52,10 +52,12 @@ usually device without a number at the end is for isohybrid." nousbmedia="No USB media found. Please insert USB stick and try again." distributionlist="suse suse-persistent fedora mint ubuntu ubuntu-persistent ipxe isohybrid" +distributionlisttext="isohybrid should work for most distribution iso images and EFI booting,\n\ +persistent preserve changes in live system after reboots." distrotitle="Select the distribution of the iso" scriptstitle="Select script to run" scriptstext="Select live-fat-stick for vfat/fat32 partition,\n\ -live-grub-stick for vfat/fat32/ntfs/etx3/ext4\n\ +live-grub-stick for vfat/fat32/ntfs/ext3/ext4\n\ and any other partition supported by grub2" supportedscripts="live-grub-stick live-fat-stick" for i in $(echo "$supportedscripts"); do @@ -102,7 +104,7 @@ if [[ $popup == zenity ]]; then sourceiso=$(zenity --file-selection --title="$fileselecttitle" --file-filter="$fileselectfilter") check_variable $sourceiso - distroname=$(zenity --list --title="distrotitle" --column="Distribution:" $distributionlist) + distroname=$(zenity --list --title="$distrotitle" --text "$distributionlisttext" --column="Distribution:" $distributionlist) check_variable $distroname usbdevice=$(zenity --list --title="$usbselecttitle" --text "$usbselecttext" --column="USB device" $usbdevicelist) check_variable $usbdevice @@ -111,7 +113,7 @@ else sourceiso=$(kdialog --title "$fileselecttitle" --getopenfilename "$fileselectpath" "$fileselectfilter") check_variable $sourceiso - distroname=$(kdialog --separate-output --title "$distrotitle" --radiolist "Distribution:" $distributionlistkd) + distroname=$(kdialog --separate-output --title "$distrotitle" --radiolist "$distributionlisttext" $distributionlistkd) check_variable $distroname usbdevice=$(kdialog --separate-output --title "$usbselecttitle" --radiolist "$usbselecttext" $usbdevicelistkd) check_variable $usbdevice
