Merge lp:~pwlars/curtinator/curtinator-ng-merge into lp:~roadmr/curtinator/trunk

[Paul Larson]

This is mostly just a merge of jibel's -ng branch on top of the current trunk. It worked for me to convert a recent bionic image.

[Daniel Manrique (roadmr)]

I don't love having curtinator run as root, it was part of the reasons why we used nc to slurp the filesystem in the first place.

If possible, I'd like to see a solution that doesn't require this.

That said, since you guys probably use this more than I do, I'll merge this so as to not block you and we can look at other options later.

review: Approve

=== modified file 'README'
--- README	2015-01-09 19:39:56 +0000
+++ README	2018-03-13 14:46:08 +0000
@@ -12,7 +12,7 @@
 
 
 Prerequisite packages and setup:
-- Install qemu-kvm libvirt-bin virt-viewer genisoimage
+- Install qemu-kvm libvirt-bin virt-viewer genisoimage libguestfs-tools
 - Add the required user to the libvirtd and kvm groups:
   sudo usermod -a -G libvirtd,kvm <username>
 - REBOOT. Logging out and back in does NOT suffice due to kvm module

=== modified file 'data/libvirt.xml'
--- data/libvirt.xml	2014-10-27 21:46:10 +0000
+++ data/libvirt.xml	2018-03-13 14:46:08 +0000
@@ -1,7 +1,7 @@
 <domain type='kvm'>
 	<name>@@NAME@@</name>
 	<uuid>@@UUID@@</uuid>
-	<memory>800000</memory>
+	<memory>1572864</memory>
 	<vcpu>1</vcpu>
 	<features>
 		<acpi/>

=== modified file 'data/preseed.txt'
--- data/preseed.txt	2018-01-05 21:46:30 +0000
+++ data/preseed.txt	2018-03-13 14:46:08 +0000
@@ -4,7 +4,9 @@
 d-i passwd/auto-login boolean true
 d-i passwd/user-fullname string Ubuntu User
 d-i passwd/username string ubuntu
-d-i passwd/user-password-crypted password $1$NxGTHVE/$NX4GcXv76Xorum3DFgx53/
+d-i passwd/user-password password ubuntu
+d-i passwd/user-password-again password ubuntu
+d-i user-setup/allow-password-weak boolean true
 d-i debian-installer/allow_unauthenticated boolean true
 d-i preseed/late_command string \
   sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list; \
@@ -21,8 +23,7 @@
   ); \
   umount /target/sys; \
   umount /target/media/cdrom; \
-  umount /target/proc; \
-  (cd /target/; tar -c ./ ) | nc @@ADDRESS@@ @@PORT@@
+  umount /target/proc
 
 d-i console-setup/ask_detect boolean false
 d-i console-setup/layoutcode string us
@@ -57,5 +58,7 @@
     grep -q "source.*/${enid}" "$eni" && exit 0; \
     { echo; echo "#curtinator added"; echo "source /$enid/*.cfg"; } >> "$eni" \
   ); \
-  (cd /target/; tar -c ./ ) | nc @@ADDRESS@@ @@PORT@@
+  umount /target/sys; \
+  umount /target/media/cdrom; \
+  umount /target/proc
 

=== modified file 'scripts/curtinator'
--- scripts/curtinator	2018-01-05 15:33:11 +0000
+++ scripts/curtinator	2018-03-13 14:46:08 +0000
@@ -1,6 +1,15 @@
 #!/bin/bash
 
-set -e
+set -eu
+
+if [ $(id -u) -ne 0  -a -z "$(echo $@ | grep -- -h)" ]; then
+    echo "E: This script must run as root. Aborting!"
+    exit 1
+fi
+
+LANG=C  # Required because output of virsh command is i18ned and string matching are failing
+SLEEP_TIME=30
+MAX_RETRY=$(( 20 * 60 / $SLEEP_TIME ))  # Retry for 20 minutes
 
 MIRROR_HOSTNAME=${MIRROR_HOSTNAME:-archive.ubuntu.com}
 MIRROR_DIRECTORY=${MIRROR_DIRECTORY:-/ubuntu}
@@ -21,18 +30,21 @@
 PATH=$(dirname $0):$PATH
 
 function usage() {
-    echo "Usage: $(basename $0) [-h] [-d DIRECTORY] [-n NAME] [-t RESULT_TARBALL] ISO"
+    trap - EXIT INT QUIT ABRT PIPE TERM
+    echo "Usage: $(basename $0) [-h] [-d] [-D DIRECTORY] [-n NAME] [-t RESULT_TARBALL] ISO"
     exit 1
 }
 
-function absolute_path() {
-    local relative_path=$1; shift
-
-    directory=$(dirname "$relative_path")
-    filename=$(basename "$relative_path")
-    echo $(cd "$directory" 2>/dev/null && pwd || echo "$directory")/$filename
+function on_exit() {
+    local rc=$?
+    echo "Cleaning environment!"
+    virsh destroy $NAME 2>/dev/null ||true
+    virsh undefine $NAME 2>/dev/null ||true
+    exit $rc
 }
 
+trap on_exit EXIT INT QUIT ABRT PIPE TERM
+
 function disk_info() {
     local info_file=$1; shift
 
@@ -136,10 +148,15 @@
         $DATA_DIR/preseed.txt
 }
 
+NAME=""
+DIRECTORY=""
+TARBALL=""
+
 # Parse the command-line options.
-while getopts "d:n:t:h" OPTION; do
+while getopts "dD:n:t:h" OPTION; do
     case ${OPTION} in
-        d) DIRECTORY=$OPTARG;;
+        d) set -x;;
+        D) DIRECTORY=$OPTARG;;
         n) NAME=$OPTARG;;
         t) TARBALL=$OPTARG;;
         h|?) usage;;
@@ -214,10 +231,10 @@
     -e "s|@@MAC@@|${MAC}|" \
     -e "s|@@NAME@@|${NAME}|" \
     -e "s|@@UUID@@|${UUID}|" \
-    -e "s|@@CDROM@@|$(absolute_path $ISO)|" \
-    -e "s|@@DISK@@|$(absolute_path $QCOW2)|" \
-    -e "s|@@KERNEL@@|$(absolute_path $DIRECTORY/$KERNEL)|" \
-    -e "s|@@INITRD@@|$(absolute_path $DIRECTORY/$INITRD)|" \
+    -e "s|@@CDROM@@|$(readlink -f $ISO)|" \
+    -e "s|@@DISK@@|$(readlink -f $QCOW2)|" \
+    -e "s|@@KERNEL@@|$(readlink -f $DIRECTORY/$KERNEL)|" \
+    -e "s|@@INITRD@@|$(readlink -f $DIRECTORY/$INITRD)|" \
     $DATA_DIR/libvirt.xml > $LIBVIRT
 
 # Destroy and undefine the previous libvirt domain silently, just in case.
@@ -230,14 +247,29 @@
 virsh -c qemu:///system "start $NAME" 
 
 # Listen on the random port and wait for the tarball.
-TARFILE="$ISO.tar"
-TGZFILE="$TARFILE.gz"
+TGZFILE="$(readlink -f $DIRECTORY)/$(basename $ISO .iso).tar.gz"
 echo "Installing, run this command for progress:"
 echo "# virt-viewer $NAME"
-# Note: gzip not available in installer environment.
-nc -l $DEFAULT_ADDRESS $DEFAULT_PORT > $TARFILE
-echo "Compressing tarball"
-gzip -f $TARFILE
+
+# Wait until installation is over 
+TRY=0
+while :; do
+    if virsh domstate $NAME|grep -q "shut off"; then
+        break
+    fi
+    sleep 30
+    TRY=$(( $TRY + 1 ))
+    if [ $TRY -ge $MAX_RETRY ]; then
+        echo "E: Reached max retries ($MAX_RETRY) Exiting!"
+        exit 1
+    fi
+done
+
+guestmount -d $NAME --ro -m /dev/sda1 /mnt
+cd /mnt
+tar czf $TGZFILE .
+cd -
+guestunmount /mnt
 
 # Patch the libvirt xml configuration so that it can be booted.
 # Note: this is a convenience, not absolutely necessary.
@@ -253,6 +285,7 @@
 # All done
 echo "Finished $TGZFILE"
 
-[ ! -z "$TARBALL" ] && (mv $TGZFILE $TARBALL; echo "Moved to $TARBALL")
-
-
+if [ -n "$TARBALL" ]; then
+    mv $TGZFILE $TARBALL
+    echo "Moved to $TARBALL"
+fi