Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-06-30 19:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace a blind cp with a more tactful apt-cdrom command.

Browse Source
This commit is contained in:
Simon Quigley 2018-07-15 03:57:02 -05:00
parent 6ce083f094
commit 3a21094494
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
calamares-settings-ubuntu (9) UNRELEASED; urgency=medium calamares-settings-ubuntu (9) UNRELEASED; urgency=medium
* Import additional translations from Weblate. * Import additional translations from Weblate.
* Replace a blind cp with a more tactful apt-cdrom command.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 15 Jul 2018 03:56:07 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Sun, 15 Jul 2018 03:56:07 -0500

2
lubuntu/modules/shellprocess.conf
View File

@ -2,5 +2,5 @@ dontChroot: true
timeout: 300 timeout: 300
script: script:
- "cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)" - "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" - "for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done"