Merge lp:~tai271828/curtinator/mr-support-cosmic into lp:~roadmr/curtinator/trunk

[Taihsiang Ho]

Add support for Cosmic. This merge request is composed of two parts:
1. Handling the initrd. The initrd archive is created in different format from the previous releases.
2. Fix the incorrect parameter expansion of network configuration.

[Daniel Manrique (roadmr)]

+1

review: Approve

[Taihsiang Ho (tai271828)]

Thanks for the comments and approval!

=== modified file 'data/preseed.txt'
--- data/preseed.txt	2018-05-02 08:10:56 +0000
+++ data/preseed.txt	2018-11-23 09:38:38 +0000
@@ -54,10 +54,9 @@
   in-target apt-get clean; \
   cp /cdrom/README.diskdefines /target; \
   (cd /target/ && \
-    eni=etc/network/interfaces; enid="$eni.d"; \
-    [ -f $eni ] || exit 0; \
-    grep -q "source.*/${enid}" "$eni" && exit 0; \
-    { echo; echo "#curtinator added"; echo "source /$enid/*.cfg"; } >> "$eni" \
+    [ -f etc/network/interfaces ] || exit 0; \
+    grep -q "source.*/etc/network/interfaces.d" etc/network/interfaces && exit 0; \
+    { echo; echo "#curtinator added"; echo "source /etc/network/interfaces.d/*.cfg"; } >> etc/network/interfaces; \
   ); \
   umount /target/sys; \
   umount /target/media/cdrom; \

=== modified file 'scripts/curtinator'
--- scripts/curtinator	2018-05-02 08:10:56 +0000
+++ scripts/curtinator	2018-11-23 09:38:38 +0000
@@ -121,6 +121,27 @@
     package_file $url example-preseed | gunzip -c -
 }
 
+function decompress_rfs_from_mixed_initrd() {
+    local initrd=$1
+    local initrd_decompressed_rfs_cpio=$2
+
+    # magic number from binwalk output of cosmic initrd
+    dd if=$initrd bs=1605632 skip=1 | unlzma -c > $initrd_decompressed_rfs_cpio
+}
+
+function compress_rfs_into_mixed_initrd() {
+    local initrd_decompressed_rfs_cpio=$1
+    local initrd=$2
+
+    local temp_rfs=$(mktemp)
+    lzma -c $initrd_decompressed_rfs_cpio > $temp_rfs
+    # extract microcode binaries
+    local temp_microcode=$(mktemp)
+    dd if=$initrd of=$temp bs=512 count=3136
+
+    cat $temp $temp_rfs > $initrd
+}
+
 function patch_initrd() {
     local initrd=$1; shift
     local files=$@
@@ -130,6 +151,7 @@
     case $initrd in
         *.gz) gunzip -c $initrd > $temp;;
         *.lz) unlzma -c -S .lz $initrd > $temp;;
+        *) decompress_rfs_from_mixed_initrd $initrd $temp;;
     esac
 
     echo $files | cpio --quiet -o -H newc -A -F $temp
@@ -137,6 +159,7 @@
     case $initrd in
         *.gz) gzip -9 -c $temp > $initrd;;
         *.lz) lzma -c $temp > $initrd;;
+        *) compress_rfs_into_mixed_initrd $temp $initrd;;
     esac
 
     rm -f $temp
@@ -194,7 +217,7 @@
 
 # Extract the needed files from the ISO image.
 DISK_INFO="/.disk/info"
-INITRD='*/initrd.*'
+INITRD='*/initrd*'
 KERNEL='*/vmlinuz*'
 PRESEED='/preseed/*'
 echo "Extracting $ISO to $DIRECTORY"