Merge ~xnox/ubuntu/+source/casper:ubuntu/devel into ubuntu/+source/casper:ubuntu/devel

[Dimitri John Ledkov]

    scripts/casper: add interactive network configuration

    If no local media is found, and no netboot is configured, offer to
    interractively configure URL netboot.

    scripts/casper: add interactive network configuration

    If no local media is found, and no netboot is configured, offer to
    interractively configure URL netboot.

[Michael Hudson-Doyle (mwhudson)]

Looks ok to me, some shell style comments (at least three different ways of formatting if statements!). How does this compare to how d-i did this?

[Dimitri John Ledkov (xnox)]

responding to feedback.

60e5873... by Dimitri John Ledkov on 2020-05-05

Whitespace fixes

e8fb7de... by Dimitri John Ledkov on 2020-05-05

Rename 'none' to 'static'.

[Dimitri John Ledkov (xnox)]

Fixed up review comments so far, still need to test this.

[Julian Andres Klode (juliank)]

This has been merged already, closing.

review: Disapprove

Unmerged commits

e8fb7de... by Dimitri John Ledkov on 2020-05-05

Rename 'none' to 'static'.

60e5873... by Dimitri John Ledkov on 2020-05-05

Whitespace fixes

83d64f1... by Dimitri John Ledkov on 2020-04-30

scripts/casper: add interactive network configuration

If no local media is found, and no netboot is configured, offer to
interractively configure URL netboot.

7e26f48... by Michael Hudson-Doyle on 2020-04-09

Import patches-unapplied version 1.445 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 0bccfcc553b20388582baea8c89aa4178350a254

New changelog entries:
  * Fix segfault in casper-md5check when plymouth is not installed (i.e.
    Ubuntu Server).

0bccfcc... by Michael Hudson-Doyle on 2020-04-07

Import patches-unapplied version 1.444 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 651b64f52a8920aec68bb284d9654465952c48ef

New changelog entries:
  * Move check for fallback persistent filesystem label (casper-rw) later as
    it seems sometimes it takes time for block devices to appear and be
    processed by udev. (LP: #1863672)

651b64f... by Dimitri John Ledkov on 2020-04-03

Import patches-unapplied version 1.443 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 0689ec6e50001c11c2db158d2545565641eb12ef

New changelog entries:
  * Make fsckd under spinner/logo themes produce consistent output
  * Make plymouth-less progress output less bad
  * Use theme-specific keys: or fsckd-cancel-msg: for Ctrl+C message LP:
    #1870018
  * Add fsck.mode=skip sensitivity to casper-md5check
  * ubuntu-server: skip mounting swap (as hacked by livecd-rootfs currently)
  * Leave fsck result as a json /run/casper-md5check.json file.
  * ubuntu-server: adapt runtime netplan into cloud-config cloud.cfg
  * Fix cmdline parsing, it was always broken

0689ec6... by Dimitri John Ledkov on 2020-03-30

Import patches-unapplied version 1.442 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 1540d20b6058f14af92c8efe6e6b196513957a6b

New changelog entries:
  * casper-md5check:
    + change progress messages to fsckd compatible ones
    + use Ctrl+C to cancel them

1540d20... by Dimitri John Ledkov on 2020-02-26

Import patches-unapplied version 1.441 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: c83900291e49492642e4ca5ff29947a810d56054

New changelog entries:
  * casper-md5check:
    + flush pending events for actually fluid progress updates
    + drop reboot includes
    + watch for s keystroke to skip checks
    + always finish on 100% update, to remove the progress message
    + always drop the keystrokes message
    + always display the result of the checks, with a slight delay
    + make the failed message linger for longer
    + clear all messages before quiting
    + ignore unused-result warnings during compilation

c839002... by Dimitri John Ledkov on 2020-02-25

Import patches-unapplied version 1.440 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 62a0dec8c55a29d1b2f513063d03432e3d458fcc

New changelog entries:
  * casper-md5check:
    + Use fsck progress text, whilst verifying the disk.
    + Do not reboot, but simply continue booting after the integrity check.
    + Perform integrity check on every boot (TODO allow skipping the check)

62a0dec... by Michael Hudson-Doyle on 2020-02-12

Import patches-unapplied version 1.439 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: bbd782ad4ce9c110d0b3ac7b82c9e54ac38fd1db

New changelog entries:
  * Create partitions with label "writable" rather than "casper-rw" (but still
    use a partition with label "casper-rw" in preference to creating one).
    (LP: #1861512)

diff --git a/scripts/casper b/scripts/casper
index eafcde4..6f05a3d 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -298,6 +298,111 @@ do_cifsmount() {
     return ${rc}
 }
 
+do_interactive_netmount() {
+    rc=1
+    if [ -x /bin/plymouth ] && plymouth --ping; then
+        plymouth hide-splash
+        sleep 1
+    fi
+    echo "Unable to find a medium container a live file system"
+    echo "Attempt interactive netboot from a URL?"
+    read -p "yes no (default yes): " RET
+    if [ "$RET" = "no" ]; then
+        return ${rc}
+    fi
+
+    # zdev
+    if type lszdev 2>/dev/null 1>/dev/null; then
+        echo "Available qeth devices:"
+        # shellcheck disable=SC2005 disable=SC2046
+        echo $(lszdev qeth --offline --columns id --no-headings | sed 's/:.*//') | fold -s -w 79
+        read -p "zdev to activate (comma separated, optional): " zdev
+        if [ -n "$zdev" ]; then
+            chzdev -e $zdev
+        fi
+    fi
+
+    # dhcp vs static
+    echo "Two methods available for IP configuration:"
+    echo "  * static: for static IP configuration"
+    echo "  * dhcp: for automatic IP configuration"
+    read -p "static dhcp (default 'dhcp'): " proto
+    # Yet support all the things linux kernel does
+    case $proto in
+        static|off|none)
+            proto=none
+            read -p "ip: " ip
+            read -p "gateway: " gateway
+            read -p "dns: " dns
+            ;;
+        dhcp|on|any|"")
+            proto=dhcp ;;
+        *)
+            echo invalid option ;;
+    esac
+
+    # vlan
+    read -p "vlan id (optional): " vlanid
+
+    # pick interface
+    interfaces=$(ls /sys/class/net | grep -v lo)
+    count=$(echo $interfaces | wc -w)
+    default_device=$(echo ${interfaces} | cut -d " " -f1)
+    if [ "$count" -gt 1 ]; then
+        if [ -n "$vlanid" ] || [ "$proto" = "none" ]; then
+            echo "Available interfaces:"
+            echo $interfaces | fold -s -w 79
+            read -p "device (default $default_device): " device
+            if [ -z "$device" ]; then
+                device=$default_device
+            fi
+        fi
+    fi
+
+    # url & proxy
+    ## todo set default
+    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)
+            echo " https://releases.ubuntu.com/focal/ubuntu-20.04-live-server-$machine.iso"
+            echo " https://releases.ubuntu.com/focal/ubuntu-20.04-desktop-$machine.iso"
+            ;;
+        *)
+            echo " http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04-live-server-$machine.iso"
+            ;;
+    esac
+    read -p "url: " url
+    if [ -z "$url" ]; then
+        echo "Must specify URL"
+        return ${rc}
+    fi
+    read -p "http_proxy (optional): " http_proxy
+    if [ -n "$http_proxy" ]; then
+        export http_proxy=$http_proxy
+    fi
+
+    if [ -n "$vlanid" ]; then
+        vlan=$device.$vlanid:$device
+        device=$device.$vlanid
+        export VLAN=$vlan
+    fi
+
+    echo Configuring networking...
+
+    export NETBOOT=url
+    export URL=$url
+    export VLAN=$vlan
+    export IP=$ip:$gateway:::$device:$proto:$dns
+    configure_networking
+    do_netmount
+}
+
 do_snap_copy ()
 {
     fromdev="${1}"
@@ -768,6 +873,12 @@ mountroot() {
             sleep 1
             i="$(($i + 1))"
         done
+
+        if [ -z "${livefs_root}" ]; then
+            if do_interactive_netmount ; then
+                livefs_root="${mountpoint}"
+            fi
+        fi
     fi
 
     if [ -z "${livefs_root}" ]; then