diff -Nru mkusb-12.4.2/debian/changelog mkusb-12.4.3/debian/changelog --- mkusb-12.4.2/debian/changelog 2020-02-16 18:55:59.000000000 +0000 +++ mkusb-12.4.3/debian/changelog 2020-03-03 13:44:46.000000000 +0000 @@ -1,3 +1,10 @@ +mkusb (12.4.3-1ubuntu1) xenial; urgency=medium + + * mkusb-plug: mkusb-sedd: puer: select label depending on + * Ubuntu version (to cater for 'writable' in Focal Fossa) + + -- Nio Wiklund Tue, 03 Mar 2020 14:44:46 +0100 + mkusb (12.4.2-1ubuntu8) xenial; urgency=medium * mkusb-plug: main: blklist=$(sudo lsblk -lo ...), l (list) added diff -Nru mkusb-12.4.2/dus mkusb-12.4.3/dus --- mkusb-12.4.2/dus 2020-02-09 16:59:20.000000000 +0000 +++ mkusb-12.4.3/dus 2020-03-03 13:44:46.000000000 +0000 @@ -140,8 +140,12 @@ # p_target: red warning about size also for dialog and text # p_list: line 1294: redirected error output to /dev/null # mkusb-select: added menu entry for mkusb-plug +# 2020-02-09 sudodus version 12.4.2 +# 2020-03-03 sudodus mkusb-plug: mkusb-sedd: puer: select label depending on +# Ubuntu version (to cater for 'writable' in Focal Fossa) +# 2020-03-03 sudodus version 12.4.3 -version="${0##*/} 12.4.2" +version="${0##*/} 12.4.3" inversvid="\0033[7m" resetvid="\0033[0m" diff -Nru mkusb-12.4.2/mkusb-plug mkusb-12.4.3/mkusb-plug --- mkusb-12.4.2/mkusb-plug 2020-02-16 18:53:47.000000000 +0000 +++ mkusb-12.4.3/mkusb-plug 2020-03-03 02:22:17.000000000 +0000 @@ -42,8 +42,9 @@ # with status=progress and check for lsblk # 2020-02-14 sudodus installer: test_host improved, offers xorriso-dd-target # 2020-02-16 sudodus main: blklist=$(sudo lsblk -lo ...), l (list) added +# 2020-03-03 sudodus mkusb-sedd: select label depending on Ubuntu version -version=2.5.4 +version=2.5.5 inversvid="\0033[7m" resetvid="\0033[0m" diff -Nru mkusb-12.4.2/mkusb-sedd mkusb-12.4.3/mkusb-sedd --- mkusb-12.4.2/mkusb-sedd 2020-02-13 08:08:49.000000000 +0000 +++ mkusb-12.4.3/mkusb-sedd 2020-03-03 02:45:35.000000000 +0000 @@ -36,8 +36,9 @@ # edits to make variable sucuess work as expected # test_host: check for dd version # with status=progress and check for lsblk +# 2020-03-03 sudodus puer: select label depending on Ubuntu version -version=2.5.2 +version=2.5.3 # global variables @@ -56,6 +57,7 @@ pd=false # persistent debian pu=false # persistent ubuntu uver= +label= verfail=false task= source= @@ -120,6 +122,50 @@ echo -e "$redback puer: could not unmount a partition on the target device $resetvid" exit fi + +echo "..... Check version of ubuntu .................................................." + +lp1=$(mktemp -d) +sudo mount -o loop "$source" "$lp1" +if [ $? -ne 0 ] +then + /bin/echo -e "$redback Loop mount of source file failed $resetvid" +else + grep -i DISKNAME "$lp1/README.diskdefines" 2> /dev/null |grep buntu + if [ $? -eq 0 ] + then + pu=true + uver=$(grep DISKNAME "$lp1/README.diskdefines"|grep buntu|tr -s ' ' '\t'|cut -f 4) + if [ $? -eq 0 ] + then + /bin/echo -e "$blueback Ubuntu or an Ubuntu family flavour $resetvid" +# echo "$uver" + if [ "$uver" = "" ] + then + echo "*** Ubuntu version not found ***" + elif test "$uver" \< "19.10" + then + echo "*** Ubuntu version $uver ***" + elif test "$uver" \= "19.10" + then + label="casper-rw" + elif test "$uver" \> "19.10" + then + label="writable" + fi + fi + fi +fi +sudo umount "$lp1" +rmdir "$lp1" +if [ "$label" == "" ] +then + echo -e "$redback puer: cannot create persistence for this version $resetvid" + exit +else + echo "label '$label' on partition for persistence" +fi + echo "$bar" echo -e "$inversvid Please wait until the process has finished and 'Done' is written $resetvid" @@ -162,10 +208,11 @@ echo "..... Create file system in partition for persistence .........................." -mkfs.ext2 -L casper-rw "$partnr" +mkfs.ext2 -L "$label" "$partnr" if [ $? -ne 0 ] then - success=false + echo -e "$redback puer: cannot create 'ext' file system $resetvid" + success=false fi sleep 2 }