Merge ~xnox/casper:add-ssl into casper:master

[Dimitri John Ledkov]

Switch to ssl, busybox in groovy in live-cd images initrd has ssl support now.

Unmerged commits

1008941... by Dimitri John Ledkov on 2020-05-23

In groovy, live-cds now have ssl support in busybox

diff --git a/debian/changelog b/debian/changelog
index 58247f8..24f57a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ casper (1.447) UNRELEASED; urgency=medium
   [ Michael Hudson-Doyle ]
   * Add interactive network configuration.
 
+  [ Dimitri John Ledkov ]
+  * Fix up interactive network configuration default ISO urls to be more
+    dynamic.
+
  -- Michael Hudson-Doyle <[e-mail]>  Wed, 06 May 2020 19:51:18 +1200
 
 casper (1.446) groovy; urgency=medium
diff --git a/scripts/casper b/scripts/casper
index f09d874..6e9ff35 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -363,28 +363,40 @@ do_interactive_netmount() {
        export IP=:$ipaddr:$gateway:::$DEVICE:$proto:$dns
     fi
 
-    # url & proxy
-    echo "Please specify URL to the .iso Examples:"
-    machine=$(uname -m)
-    case $machine in
-        x86_64) machine="amd64" ;;
-        ppc64le) machine="ppc64el" ;;
-        aarch64) machine="arm64" ;;
-    esac
-    case $machine in
-        amd64)
-            default_url=http://releases.ubuntu.com/focal/ubuntu-20.04-live-server-$machine.iso
-            echo " $default_url (default)"
-            echo " http://releases.ubuntu.com/focal/ubuntu-20.04-desktop-$machine.iso"
+    . /etc/os-release
+    # TODO: not sure how to get flavour information
+    # maybe make livecd-rootfs embed something in the casper initrd?
+    case $PRETTY_NAME in
+        *development*)
+            server_url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/$UBUNTU_CODENAME-live-server-$DPKG_ARCH.iso
+            desktop_url=http://cdimage.ubuntu.com/daily-live/current/$UBUNTU_CODENAME-desktop-$DPKG_ARCH.iso
             ;;
         *)
-            default_url=http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04-live-server-$machine.iso
-            echo " $default_url (default)"
+            case $DPKG_ARCH in
+                amd64)
+                    server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+                    desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
+                    ;;
+                *)
+                    server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+                    desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
+                    ;;
+            esac
             ;;
     esac
+
+    # Currently only arm64 & amd64 produce desktop images
+    case $DPKG_ARCH in
+        amd64|arm64) ;;
+        *) desktop_url="" ;;
+    esac
+
+    echo " $server_url (default)"
+    [ "$desktop_url" ] && echo " $desktop_url"
+
     read -p "url: " url
     if [ -z "$url" ]; then
-        url=$default_url
+        url=$server_url
     fi
     read -p "http_proxy (optional): " http_proxy
     if [ -n "$http_proxy" ]; then