From 8c5e3a0061d779df80c3e90bcc8d420244ad9db3 Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Sun, 7 Oct 2018 00:06:42 -0500 Subject: [PATCH] Ensure install .desktop file is always removed. Summary: Fixes T82. Test Plan: Install and reboot. Desktop should be free of the install .desktop file. This has been tested already for EFI and BIOS in a virtual machine, but since this is related to a task that concerns a rather particular system consisting of 32 bit EFI with a 64 bit processor, it will need to be tested in other cases. Reviewers: tsimonq2 Reviewed By: tsimonq2 Maniphest Tasks: T82 Differential Revision: https://phab.lubuntu.me/D30 --- debian/changelog | 6 ++++++ lubuntu/modules/after_bootloader_context.conf | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac659b6..c30d40f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (23) cosmic; urgency=medium + + * Lubuntu: ensure install .desktop file is always removed. + + -- Walter Lapchynski Sat, 06 Oct 2018 19:15:02 -0700 + calamares-settings-ubuntu (22) cosmic; urgency=medium * Lubuntu: enable LUKS/encryption. diff --git a/lubuntu/modules/after_bootloader_context.conf b/lubuntu/modules/after_bootloader_context.conf index 2e9b8a7..a1d2e6a 100644 --- a/lubuntu/modules/after_bootloader_context.conf +++ b/lubuntu/modules/after_bootloader_context.conf @@ -6,7 +6,4 @@ dontChroot: false timeout: 120 firmwareType: - efi: - - -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done - bios: - - -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done + "*": "-for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done"