From 3a210944949be10123fe6faa97d12acb7efdb9c6 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sun, 15 Jul 2018 03:57:02 -0500 Subject: [PATCH] Replace a blind cp with a more tactful apt-cdrom command. --- debian/changelog | 1 + lubuntu/modules/shellprocess.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8178695..a7ee8ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares-settings-ubuntu (9) UNRELEASED; urgency=medium * Import additional translations from Weblate. + * Replace a blind cp with a more tactful apt-cdrom command. -- Simon Quigley Sun, 15 Jul 2018 03:56:07 -0500 diff --git a/lubuntu/modules/shellprocess.conf b/lubuntu/modules/shellprocess.conf index 2a8995c..a650b43 100644 --- a/lubuntu/modules/shellprocess.conf +++ b/lubuntu/modules/shellprocess.conf @@ -2,5 +2,5 @@ dontChroot: true timeout: 300 script: - "cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)" - - "[ -d /sys/firmware/efi ] && cp /etc/apt/sources.list @@ROOT@@/etc/apt/sources.list && chroot @@ROOT@@ sed -e '/deb http/ s/^#*/#/' -i /etc/apt/sources.list && chroot @@ROOT@@ apt update && chroot @@ROOT@@ apt -y install grub-efi-amd64-bin && chroot @@ROOT@@ sed -i 's/#deb/deb/' /etc/apt/sources.list && sed -i '/deb cdrom/d' @@ROOT@@/etc/apt/sources.list || exit 0" + - "[ -d /sys/firmware/efi ] && chroot @@ROOT@@ apt-cdrom add -d=/media/apt/ && chroot @@ROOT@@ sed -e '/deb http/ s/^#*/#/' -i /etc/apt/sources.list && chroot @@ROOT@@ apt update && chroot @@ROOT@@ apt -y install grub-efi-amd64-bin && chroot @@ROOT@@ sed -i 's/#deb/deb/' /etc/apt/sources.list && sed -i '/deb cdrom/d' @@ROOT@@/etc/apt/sources.list || exit 0" - "for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done"