diff --git a/data/custom-installation/patch/10_lupin b/data/custom-installation/patch/10_lupin index 1419129..fb20ba7 100755 --- a/data/custom-installation/patch/10_lupin +++ b/data/custom-installation/patch/10_lupin @@ -166,6 +166,57 @@ EOF EOF } +lupin_version_test_numeric () +{ + lupin_version_test_numeric_a="$1" + lupin_version_test_numeric_cmp="$2" + lupin_version_test_numeric_b="$3" + if [ "$lupin_version_test_numeric_a" = "$lupin_version_test_numeric_b" ] ; then + case "$lupin_version_test_numeric_cmp" in + ge|eq|le) return 0 ;; + gt|lt) return 1 ;; + esac + fi + if [ "$lupin_version_test_numeric_cmp" = "lt" ] ; then + lupin_version_test_numeric_c="$lupin_version_test_numeric_a" + lupin_version_test_numeric_a="$lupin_version_test_numeric_b" + lupin_version_test_numeric_b="$lupin_version_test_numeric_c" + fi + if (echo "$lupin_version_test_numeric_a" ; echo "$lupin_version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$lupin_version_test_numeric_b" ; then + return 0 + else + return 1 + fi +} + +lupin_version_test_gt () +{ + lupin_version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`" + lupin_version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`" + lupin_version_test_gt_cmp=gt + if [ "x$lupin_version_test_gt_b" = "x" ] ; then + return 0 + fi + case "$lupin_version_test_gt_a:$lupin_version_test_gt_b" in + *.old:*.old) ;; + *.old:*) lupin_version_test_gt_a="`echo "$lupin_version_test_gt_a" | sed -e 's/\.old$//'`" ; lupin_version_test_gt_cmp=gt ;; + *:*.old) lupin_version_test_gt_b="`echo "$lupin_version_test_gt_b" | sed -e 's/\.old$//'`" ; lupin_version_test_gt_cmp=ge ;; + esac + lupin_version_test_numeric "$lupin_version_test_gt_a" "$lupin_version_test_gt_cmp" "$lupin_version_test_gt_b" + return "$?" +} + +lupin_version_find_latest () +{ + lupin_version_find_latest_a="" + for i in "$@" ; do + if lupin_version_test_gt "$i" "$lupin_version_find_latest_a" ; then + lupin_version_find_latest_a="$i" + fi + done + echo "$lupin_version_find_latest_a" +} + machine=`uname -m` case "x$machine" in xi?86 | xx86_64) @@ -237,7 +288,7 @@ submenu_indentation="" is_first_entry=true while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` + linux=`lupin_version_find_latest $list` gettext_printf "Found linux image: %s\n" "$linux" >&2 basename=`basename $linux` dirname=`dirname $linux` diff --git a/data/isolist.ini b/data/isolist.ini index 0cc37cf..61f9384 100644 --- a/data/isolist.ini +++ b/data/isolist.ini @@ -21,7 +21,7 @@ max_iso_size=3700000000 arch=i386 name=Ubuntu packages=ubuntu-desktop -metalink=http://releases.ubuntu.com/22.04.2/ubuntu-22.04.2-desktop-i386.list +metalink=http://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-desktop-i386.list metalink2=https://cdimage.ubuntu.com/jammy/daily-live/current/jammy-desktop-i386.list website=http://www.ubuntu.com ordering=1 @@ -31,7 +31,7 @@ max_iso_size=3700000000 arch=amd64 name=Ubuntu packages=ubuntu-desktop -metalink=https://releases.ubuntu.com/22.04.2/ubuntu-22.04.2-desktop-amd64.list +metalink=https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-desktop-amd64.list metalink2=https://cdimage.ubuntu.com/jammy/daily-live/current/jammy-desktop-amd64.list website=http://www.ubuntu.com ordering=1 @@ -41,7 +41,7 @@ max_iso_size=3700000000 arch=i386 name=Kubuntu packages=kubuntu-desktop -metalink=http://cdimage.ubuntu.com/kubuntu/releases/22.04.2/release/kubuntu-22.04.2-desktop-i386.list +metalink=http://cdimage.ubuntu.com/kubuntu/releases/22.04.4/release/kubuntu-22.04.4-desktop-i386.list metalink2=https://cdimage.ubuntu.com/kubuntu/jammy/daily-live/current/jammy-desktop-i386.list website=http://www.kubuntu.org ordering=3 @@ -51,7 +51,7 @@ max_iso_size=3700000000 arch=amd64 name=Kubuntu packages=kubuntu-desktop -metalink=http://cdimage.ubuntu.com/kubuntu/releases/22.04.2/release/kubuntu-22.04.2-desktop-amd64.list +metalink=http://cdimage.ubuntu.com/kubuntu/releases/22.04.4/release/kubuntu-22.04.4-desktop-amd64.list metalink2=https://cdimage.ubuntu.com/kubuntu/jammy/daily-live/current/jammy-desktop-amd64.list website=http://www.kubuntu.org ordering=3 @@ -61,7 +61,7 @@ max_iso_size=2700000000 arch=i386 name=Xubuntu packages=xubuntu-desktop -metalink=http://cdimage.ubuntu.com/xubuntu/releases/22.04.2/release/xubuntu-22.04.2-desktop-i386.list +metalink=http://cdimage.ubuntu.com/xubuntu/releases/22.04.4/release/xubuntu-22.04.4-desktop-i386.list metalink2=http://cdimage.ubuntu.com/xubuntu/jammy/daily-live/current/jammy-desktop-i386.list website=http://www.xubuntu.org ordering=4 @@ -71,7 +71,7 @@ max_iso_size=2700000000 arch=amd64 name=Xubuntu packages=xubuntu-desktop -metalink=http://cdimage.ubuntu.com/xubuntu/releases/22.04.2/release/xubuntu-22.04.2-desktop-amd64.list +metalink=http://cdimage.ubuntu.com/xubuntu/releases/22.04.4/release/xubuntu-22.04.4-desktop-amd64.list metalink2=http://cdimage.ubuntu.com/xubuntu/jammy/daily-live/current/jammy-desktop-amd64.list website=http://www.xubuntu.org ordering=4 @@ -81,7 +81,7 @@ max_iso_size=2900000000 arch=i386 name=Ubuntu Budgie packages=budgie-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/22.04.2/release/ubuntu-budgie-22.04.2-desktop-i386.list +metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/22.04.4/release/ubuntu-budgie-22.04.4-desktop-i386.list metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/jammy/daily-live/current/jammy-desktop-i386.list website=http://ubuntubudgie.org ordering=5 @@ -91,7 +91,7 @@ max_iso_size=2900000000 arch=amd64 name=Ubuntu Budgie packages=budgie-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/22.04.2/release/ubuntu-budgie-22.04.2-desktop-amd64.list +metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/22.04.4/release/ubuntu-budgie-22.04.4-desktop-amd64.list metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/jammy/daily-live/current/jammy-desktop-amd64.list website=http://ubuntubudgie.org ordering=5 @@ -101,7 +101,7 @@ max_iso_size=2600000000 arch=i386 name=Lubuntu packages=lubuntu-desktop -metalink=http://cdimage.ubuntu.com/lubuntu/releases/22.04.2/release/lubuntu-22.04.2-desktop-i386.list +metalink=http://cdimage.ubuntu.com/lubuntu/releases/22.04.4/release/lubuntu-22.04.4-desktop-i386.list metalink2=http://cdimage.ubuntu.com/lubuntu/jammy/daily-live/current/jammy-desktop-i386.list website=http://lubuntu.net ordering=7 @@ -111,7 +111,7 @@ max_iso_size=2600000000 arch=amd64 name=Lubuntu packages=lubuntu-desktop -metalink=http://cdimage.ubuntu.com/lubuntu/releases/22.04.2/release/lubuntu-22.04.2-desktop-amd64.list +metalink=http://cdimage.ubuntu.com/lubuntu/releases/22.04.4/release/lubuntu-22.04.4-desktop-amd64.list metalink2=http://cdimage.ubuntu.com/lubuntu/jammy/daily-live/current/jammy-desktop-amd64.list website=http://lubuntu.net ordering=7 @@ -121,7 +121,7 @@ max_iso_size=4500000000 arch=i386 name=Ubuntu Studio packages=ubuntustudio-desktop -metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/22.04.2/release/ubuntustudio-22.04.2-dvd-i386.list +metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/22.04.4/release/ubuntustudio-22.04.4-dvd-i386.list metalink2=https://cdimage.ubuntu.com/ubuntustudio/jammy/dvd/current/jammy-dvd-i386.list website=http://ubuntustudio.org ordering=8 @@ -131,7 +131,7 @@ max_iso_size=4500000000 arch=amd64 name=Ubuntu Studio packages=ubuntustudio-desktop -metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/22.04.2/release/ubuntustudio-22.04.2-dvd-amd64.list +metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/22.04.4/release/ubuntustudio-22.04.4-dvd-amd64.list metalink2=https://cdimage.ubuntu.com/ubuntustudio/jammy/dvd/current/jammy-dvd-amd64.list website=http://ubuntustudio.org ordering=8 @@ -141,7 +141,7 @@ max_iso_size=2900000000 arch=i386 name=Ubuntu MATE packages=ubuntu-mate-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/22.04.2/release/ubuntu-mate-22.04.2-desktop-i386.list +metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/22.04.4/release/ubuntu-mate-22.04.4-desktop-i386.list metalink2=http://cdimage.ubuntu.com/ubuntu-mate/jammy/daily-live/current/jammy-desktop-i386.list website=http://ubuntu-mate.org/ ordering=9 @@ -151,7 +151,7 @@ max_iso_size=2900000000 arch=amd64 name=Ubuntu MATE packages=ubuntu-mate-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/22.04.2/release/ubuntu-mate-22.04.2-desktop-amd64.list +metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/22.04.4/release/ubuntu-mate-22.04.4-desktop-amd64.list metalink2=http://cdimage.ubuntu.com/ubuntu-mate/jammy/daily-live/current/jammy-desktop-amd64.list website=http://ubuntu-mate.org ordering=9 @@ -161,7 +161,7 @@ max_iso_size=5000000000 arch=i386 name=Ubuntu Kylin packages=ubuntukylin-desktop -metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/22.04.2/release/ubuntukylin-22.04.2-desktop-i386.list +metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/22.04.4/release/ubuntukylin-22.04.4-desktop-i386.list metalink2=http://cdimage.ubuntu.com/ubuntukylin/jammy/daily-live/current/jammy-desktop-i386.list website=http://www.ubuntukylin.com ordering=A @@ -171,7 +171,7 @@ max_iso_size=5000000000 arch=amd64 name=Ubuntu Kylin packages=ubuntukylin-desktop -metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/22.04.2/release/ubuntukylin-22.04.2-desktop-amd64.list +metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/22.04.4/release/ubuntukylin-22.04.4-desktop-amd64.list metalink2=http://cdimage.ubuntu.com/ubuntukylin/jammy/daily-live/current/jammy-desktop-amd64.list website=http://www.ubuntukylin.com ordering=A @@ -181,7 +181,7 @@ version= arch=i386 name=Wubi packages= -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -192,7 +192,7 @@ version= arch=amd64 name=Wubi packages= -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -204,7 +204,7 @@ arch=i386 name=Wubi lz packages= initrd=casper/initrd.lz -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -216,7 +216,7 @@ arch=amd64 name=Wubi lz packages= initrd=casper/initrd.lz -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -229,7 +229,7 @@ name=Wubi EFI packages= kernel=casper/vmlinuz.efi initrd=casper/initrd.lz -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -242,7 +242,7 @@ name=Wubi EFI packages= kernel=casper/vmlinuz.efi initrd=casper/initrd.lz -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -255,7 +255,7 @@ name=Wubi MD5 packages= initrd=casper/initrd.lz md5sums=MD5SUMS -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -268,7 +268,7 @@ name=Wubi MD5 packages= initrd=casper/initrd.lz md5sums=MD5SUMS -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -280,7 +280,7 @@ arch=i386 name=Wubi gz packages= initrd=casper/initrd.gz -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -292,7 +292,7 @@ arch=amd64 name=Wubi gz packages= initrd=casper/initrd.gz -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -305,7 +305,7 @@ name=Wubi SHA256 packages= initrd=casper/initrd.lz md5sums=SHA256SUMS -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -318,7 +318,7 @@ name=Wubi SHA256 packages= initrd=casper/initrd.lz md5sums=SHA256SUMS -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -330,7 +330,7 @@ arch=i386 name=Wubi lz4 packages= initrd=casper/initrd.lz4 -metalink=22.04.2-desktop-i386.list +metalink=22.04.4-desktop-i386.list metalink2=jammy-desktop-i386.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -342,7 +342,7 @@ arch=amd64 name=Wubi lz4 packages= initrd=casper/initrd.lz4 -metalink=22.04.2-desktop-amd64.list +metalink=22.04.4-desktop-amd64.list metalink2=jammy-desktop-amd64.list website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki diff --git a/data/wubildr.cfg b/data/wubildr.cfg index 69cd747..bf99f30 100644 --- a/data/wubildr.cfg +++ b/data/wubildr.cfg @@ -1,8 +1,8 @@ set show_panic_message=true if search -s -f -n /ubuntu/disks/root.disk; then - if loopback loop0 /ubuntu/disks/root.disk; then - set root=(loop0) + if loopback loopw0 /ubuntu/disks/root.disk; then + set root=(loopw0) if [ -e /boot/grub/grub.cfg ]; then set prefix=($root)'/boot/grub' if configfile /boot/grub/grub.cfg; then diff --git a/debian/changelog b/debian/changelog index 1444141..8c2eec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +wubi (22.04.5r346) jammy; urgency=low + + [Hakuna Matata] + + * Bump to 22.04.4 + https://github.com/hakuna-m/wubiuefi/issues/348 + * Change device name loop0 to loopw0 in wubildr.cfg to suppress "already exists" errors + https://github.com/hakuna-m/wubiuefi/issues/345 + * Add version_find_latest in 10_lupin to support newer GRUB versions + https://github.com/hakuna-m/wubiuefi/issues/342 + https://github.com/hakuna-m/wubiuefi/issues/341 + wubi (22.04.2r345) jammy; urgency=low [Hakuna Matata]