Hello community, here is the log from the commit of package live-fat-stick for openSUSE:Factory checked in at 2017-06-26 15:53:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live-fat-stick (Old) and /work/SRC/openSUSE:Factory/.live-fat-stick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "live-fat-stick" Mon Jun 26 15:53:42 2017 rev:9 rq:505864 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/live-fat-stick/live-fat-stick.changes 2016-08-17 12:06:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.live-fat-stick.new/live-fat-stick.changes 2017-06-26 15:53:47.786689630 +0200 @@ -1,0 +2,7 @@ +Wed Jun 21 12:18:47 UTC 2017 - [email protected] + +- tag 0.4.2 version +- use --force to install grub +- more explanations in GUI + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live-fat-stick.spec ++++++ --- /var/tmp/diff_new_pack.ELCpJG/_old 2017-06-26 15:53:48.846540178 +0200 +++ /var/tmp/diff_new_pack.ELCpJG/_new 2017-06-26 15:53:48.850539615 +0200 @@ -17,7 +17,7 @@ Name: live-fat-stick -Version: 0.4.1 +Version: 0.4.2 Release: 0 Summary: Create live usb stick on fat partition License: GPL-2.0+ @@ -32,7 +32,11 @@ Requires: parted Requires: syslinux Requires: util-linux +%if 0%{?fedora_version} +Requires: qemu-kvm +%else Requires: qemu-tools +%endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -77,7 +81,11 @@ Requires: grub2 Requires: parted Requires: util-linux +%if 0%{?fedora_version} +Requires: qemu-kvm +%else Requires: qemu-tools +%endif Summary: Create multiboot live usb stick using grub2 Group: System/Management ++++++ live-grub-stick ++++++ --- /var/tmp/diff_new_pack.ELCpJG/_old 2017-06-26 15:53:48.886534539 +0200 +++ /var/tmp/diff_new_pack.ELCpJG/_new 2017-06-26 15:53:48.886534539 +0200 @@ -328,7 +328,7 @@ grub2_stuff () { echo "installing grub2 on $stickdevice" mkdir -p $stickmount/boot - $grubinstall --target=i386-pc --boot-directory=$stickmount/boot $stickdevice + $grubinstall --force --target=i386-pc --boot-directory=$stickmount/boot $stickdevice echo "setting $stickdevice partition $stickpart active" parted $stickdevice set $stickpart boot on &>/dev/null cfg_setup ++++++ live-usb-gui ++++++ --- /var/tmp/diff_new_pack.ELCpJG/_old 2017-06-26 15:53:48.906531719 +0200 +++ /var/tmp/diff_new_pack.ELCpJG/_new 2017-06-26 15:53:48.906531719 +0200 @@ -48,8 +48,15 @@ fileselectpath="/" fileselectfilter="*iso" usbselecttitle="Select the target USB device" +usbselecttext="Select the correct device, usually the one with a number at the end;\n\ +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" 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\ +and any other partition supported by grub2" supportedscripts="live-grub-stick live-fat-stick" for i in $(echo "$supportedscripts"); do if which $i > /dev/null 2>&1; then @@ -64,6 +71,15 @@ echo $i # fi done) +if [ -z "$usbdevicelist" ] ; then + if [[ $popup == zenity ]]; then + zenity --error --text="$nousbmedia" + else + kdialog --error "$nousbmedia" + fi + clean_up + exit 1 +fi usbdevicelistkd=$(for device in $usbdevicelist; do printf "%s %s %s" ${device} ${device} off printf "\n" @@ -86,20 +102,20 @@ if [[ $popup == zenity ]]; then sourceiso=$(zenity --file-selection --title="$fileselecttitle" --file-filter="$fileselectfilter") check_variable $sourceiso - usbdevice=$(zenity --list --title="$usbselecttitle" --column="USB device" $usbdevicelist) - check_variable $usbdevice distroname=$(zenity --list --title="distrotitle" --column="Distribution:" $distributionlist) check_variable $distroname - scriptorun=$(zenity --list --title="Select script to run" --column="Scripts:" $scriptlist) + usbdevice=$(zenity --list --title="$usbselecttitle" --text "$usbselecttext" --column="USB device" $usbdevicelist) + check_variable $usbdevice + scriptorun=$(zenity --list --title="Select script to run" --text "$scriptstext" --column="Scripts:" $scriptlist) check_variable $scriptorun else sourceiso=$(kdialog --title "$fileselecttitle" --getopenfilename "$fileselectpath" "$fileselectfilter") check_variable $sourceiso - usbdevice=$(kdialog --separate-output --title "$usbselecttitle" --radiolist "USB device:" $usbdevicelistkd) - check_variable $usbdevice distroname=$(kdialog --separate-output --title "$distrotitle" --radiolist "Distribution:" $distributionlistkd) check_variable $distroname - scriptorun=$(kdialog --separate-output --title "Select script to run" --radiolist "Scripts:" $scriptlistkd) + usbdevice=$(kdialog --separate-output --title "$usbselecttitle" --radiolist "$usbselecttext" $usbdevicelistkd) + check_variable $usbdevice + scriptorun=$(kdialog --separate-output --title "$scriptstitle" --radiolist "$scriptstext" $scriptlistkd) check_variable $scriptorun fi
