mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-19 23:51:08 +00:00
Preserve ubuntu-advantage-tools' apt preferences against live-build's attempt to delete them.
This commit is contained in:
parent
3a3e0defbd
commit
bc0edf358d
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
||||
livecd-rootfs (2.208.18) UNRELEASED; urgency=medium
|
||||
|
||||
* Preserve ubuntu-advantage-tools' apt preferences against live-build's
|
||||
attempt to delete them.
|
||||
|
||||
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 06 Dec 2019 10:23:03 +1300
|
||||
|
||||
livecd-rootfs (2.208.17) trusty; urgency=medium
|
||||
|
||||
* Drop /etc/update-motd.d/51-cloudguest from cloud images; this is not
|
||||
|
@ -49,6 +49,12 @@ EOF
|
||||
|
||||
lb chroot "$@"
|
||||
|
||||
if [ -d chroot/etc/apt/preferences.d.save ]; then
|
||||
# https://twitter.com/infinite_scream
|
||||
mv chroot/etc/apt/preferences.d.save/* chroot/etc/apt/preferences.d/
|
||||
rmdir chroot/etc/apt/preferences.d.save
|
||||
fi
|
||||
|
||||
if [ -f config/oem-config-preinstalled ]; then
|
||||
|
||||
# This is cargo-culted almost verbatim (with some syntax changes for
|
||||
|
@ -632,6 +632,18 @@ case $PROJECT in
|
||||
cat > config/hooks/100-remove-fstab.chroot <<EOF
|
||||
#! /bin/sh
|
||||
rm -f /etc/fstab
|
||||
EOF
|
||||
;;
|
||||
|
||||
ubuntu-base)
|
||||
cat > config/hooks/100-preserve-ua-tools-prefs.chroot <<EOF
|
||||
#! /bin/sh -ex
|
||||
|
||||
# live-build "helpfully" removes /etc/apt/preferences.d/* so we put a
|
||||
# copy somewhere it won't touch it.
|
||||
|
||||
cp -a /etc/apt/preferences.d /etc/apt/preferences.d.save
|
||||
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user