cherry-pick 25c29cf

  * fix issue #113: ignore ubiquity uninstallation

debian/changelog

@@ -1,3 +1,10 @@
+dell-recovery (1.61~somerville9) bionic; urgency=medium
+
+  * cherry-pick 25c29cfde546de58d32192e5de11e197d6857e50
+    * fix issue #113: ignore ubiquity uninstallation
+
+ -- Alex Tu <[email protected]>  Wed, 23 Dec 2020 13:59:21 +0800
+
 dell-recovery (1.61~somerville8) bionic; urgency=medium
 
   * Do not wake up network at stage 2 (issue #114).

late/scripts/chroot.sh

@@ -148,7 +148,7 @@ if [ -f "$TARGET/tmp/apt-installed" ]; then
     mv $TARGET/tmp/apt-installed $TARGET/var/lib/ubiquity/dell-apt
     sed "s/:$(dpkg --print-architecture)//g" $TARGET/var/lib/ubiquity/installed-packages > $TARGET/var/lib/ubiquity/installed-packages-filtered
     grep -x -f $TARGET/var/lib/ubiquity/dell-apt $TARGET/var/lib/ubiquity/installed-packages-filtered > $TARGET/var/lib/ubiquity/dell_installed
-    awk '{print $0}' $TARGET/var/lib/ubiquity/dell-apt $TARGET/var/lib/ubiquity/dell_installed |sort |uniq -u > $TARGET/var/lib/ubiquity/dell_uninstalled
+    awk '{print $0}' $TARGET/var/lib/ubiquity/dell-apt $TARGET/var/lib/ubiquity/dell_installed | grep -v ubiquity |sort |uniq -u > $TARGET/var/lib/ubiquity/dell_uninstalled
 fi
 
 #check the checked_uninstalled file is empty or not, we will turn to FAIL-SCRIPT if it is not empty