Merge lp:~smoser/curtinator/fix-default-address into lp:~roadmr/curtinator/trunk

[Scott Moser]

Fix setting of DEFAULT_ADDRESS on bionic.

ifconfig output is fragile, and changed between xenial and bionic.
The change modifies DEFAULT_ADDRESS to use 'ip show dev' rather than
'ifconfig'. Also fails early if no address is found.

[Daniel Manrique (roadmr)]

This really shows curtinator's age :)

Thanks for this! I'll merge in a sec.

review: Approve

=== modified file 'scripts/curtinator'
--- scripts/curtinator	2016-05-25 20:47:05 +0000
+++ scripts/curtinator	2018-01-05 15:34:08 +0000
@@ -6,7 +6,11 @@
 MIRROR_DIRECTORY=${MIRROR_DIRECTORY:-/ubuntu}
 MIRROR_PREFIX="http://$MIRROR_HOSTNAME$MIRROR_DIRECTORY"
 
-DEFAULT_ADDRESS=$(ifconfig virbr0 | sed -n 's/.*inet addr:\([0-9.]\+\)\s.*/\1/p')
+DEFAULT_ADDRESS=$(
+    ip address show dev virbr0 |
+    awk '$1 == "inet" && /scope global/ {
+            sub(/\/.*/, "", $2); print $2; exit(0); }')
+
 DEFAULT_RELEASE=$(lsb_release -c | cut -f 2)
 DEFAULT_PORT=$(($RANDOM % 1024 + 1024))
 DEFAULT_ARCHITECTURE=$(dpkg --print-architecture)
@@ -157,6 +161,9 @@
 [ -z "$DIRECTORY" ] && DIRECTORY=$NAME
 [ ! -d "$DIRECTORY" ] && mkdir -p "$DIRECTORY"
 
+[ -n "$DEFAULT_ADDRESS" ] ||
+    { echo "failed to get address of virbr0"; exit 1; }
+
 # Extract the needed files from the ISO image.
 DISK_INFO="/.disk/info"
 INITRD='*/initrd.*'