From 27b10443ad46c623a0df677dcef7064b9afa7085 Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Fri, 22 May 2020 13:14:42 -0700 Subject: [PATCH] Fix dvd.list leftover in /etc/apt/sources.list.d --- debian/changelog | 7 +++++++ ubuntustudio/modules/before_bootloader_context.conf | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3b7c4d9..36a6dd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares-settings-ubuntu (1:20.10.3) UNRELEASED; urgency=medium + + [ Erich Eickmeyer] + * UbuntuStudio: Fix for leftover dvd.list file in /etc/apt/sources.list.d + + -- Erich Eickmeyer Fri, 22 May 2020 13:12:21 -0700 + calamares-settings-ubuntu (1:20.10.2) groovy; urgency=medium [ Erich Eickmeyer ] diff --git a/ubuntustudio/modules/before_bootloader_context.conf b/ubuntustudio/modules/before_bootloader_context.conf index 1c6d60c..cb5223c 100644 --- a/ubuntustudio/modules/before_bootloader_context.conf +++ b/ubuntustudio/modules/before_bootloader_context.conf @@ -10,6 +10,8 @@ firmwareType: timeout: 10 - command: sed -i '/deb http/d' /etc/apt/sources.list timeout: 10 + - command: if [ -f /etc/apt/sources.list.d/dvd.list ]; then rm /etc/apt/sources.list.d/dvd.list; fi + timeout: 10 - command: apt-get update timeout: 120 - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if grep -q 64 /sys/firmware/efi/fw_platform_size; then echo amd64-signed; else echo ia32; fi)