Merge lp:~heber013/ubiquity/fixing_initrd_unpacking into lp:ubiquity

[Heber Parrucci]

Fixing initrd unpacking-repacking

Fixing initrd unpacking-repacking

[Jean-Baptiste Lallement (jibel)]

Ubiquity VCS has moved to git (git clone lp:ubiquity)
Could you please propose a PR against the git source. Thanks.

Unmerged revisions

6644. By Heber Parrucci on 2018-08-27

adding back keyboard layout step

6643. By Heber Parrucci on 2018-08-22

Fixing initrd unpacking-repacking

=== modified file 'autopilot/ubiquity-autopilot-runner/run-ubiquity-test'
--- autopilot/ubiquity-autopilot-runner/run-ubiquity-test	2015-09-23 14:41:54 +0000
+++ autopilot/ubiquity-autopilot-runner/run-ubiquity-test	2018-08-27 14:18:08 +0000
@@ -163,7 +163,7 @@
         exit
     fi
 
-    files="casper/initrd.lz casper/$(basename $KERNEL)"
+    files="casper/initrd casper/$(basename $KERNEL)"
     echo "I: extracting files from $src: $files"
     bsdtar xf $src -C $dst $files
     ret=$?
@@ -205,30 +205,31 @@
     #   Nothing
     workdir=$1/initrd
     initrd=$2
-    initrdlz=${initrd}.lz
     usercustomdir=$3
     customdir=${BINDIR}/custom-installation
 
     echo "I: Preparing initrd"
-    if [ ! -f "$initrdlz" ]; then
-        echo "E: file '$(basename $initrdlz)' not found. Aborting!"
+    if [ ! -f "$initrd" ]; then
+        echo "E: file '$(basename $initrd)' not found. Aborting!"
         RC=1
         exit 
     fi
     mkdir -p $workdir
 
     (
-        cd $workdir
-        xzcat $initrdlz|cpio --quiet -ivd 2>/dev/null
+        cd $1
+        unmkinitramfs $initrd $workdir
         echo "I: Copying overrides"
-        cp -af $customdir $workdir/
-        [ -d "$usercustomdir" ] && cp -af "$usercustomdir" $workdir/
-        mkdir -p $workdir/custom-installation/iso-override/var/local/autopilot
-        echo "$TESTNAME" > $workdir/custom-installation/iso-override/var/local/autopilot/testsuites
-        [ -f "$TESTCONFIG" ] && cp $TESTCONFIG $workdir/custom-installation/iso-override/var/local/autopilot/config
+        maindir=$workdir/main
+        cd $maindir
+        cp -af $customdir $maindir/
+        [ -d "$usercustomdir" ] && cp -af "$usercustomdir" $maindir/
+        mkdir -p $maindir/custom-installation/iso-override/var/local/autopilot
+        echo "$TESTNAME" > $maindir/custom-installation/iso-override/var/local/autopilot/testsuites
+        [ -f "$TESTCONFIG" ] && cp $TESTCONFIG $maindir/custom-installation/iso-override/var/local/autopilot/config
         if [ -n "$SHAREDDIR" ]; then
-            echo >> $workdir/custom-installation/iso-override/var/local/autopilot/config
-            echo "SHAREDVOL=ubiquity" >> $workdir/custom-installation/iso-override/var/local/autopilot/config
+            echo >> $maindir/custom-installation/iso-override/var/local/autopilot/config
+            echo "SHAREDVOL=ubiquity" >> $maindir/custom-installation/iso-override/var/local/autopilot/config
         fi
         echo "I: Repacking initrd"
         [ -f "$initrd" ] && rm -f $initrd