Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 01:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu-cpc hooks are Different

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2019-12-13 09:01:30 +13:00
parent fb31b64a7c
commit f27b432026
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live-build/auto/config
View File

@ -1096,7 +1096,8 @@ rm -f /etc/fstab
EOF EOF
fi fi
cat > config/hooks/100-preserve-apt-prefs.chroot <<EOF if [ $PROJECT != ubuntu-cpc ]; then
cat > config/hooks/100-preserve-apt-prefs.chroot <<\EOF
#! /bin/sh -ex #! /bin/sh -ex
# live-build "helpfully" removes /etc/apt/preferences.d/* so we put a # live-build "helpfully" removes /etc/apt/preferences.d/* so we put a
@ -1106,6 +1107,7 @@ if [ -n "$(ls -A /etc/apt/preferences.d)" ]; then
cp -a /etc/apt/preferences.d /etc/apt/preferences.d.save cp -a /etc/apt/preferences.d /etc/apt/preferences.d.save
fi fi
EOF EOF
fi
if [ $PROJECT = ubuntukylin ]; then if [ $PROJECT = ubuntukylin ]; then
cat > config/hooks/100-ubuntukylin.chroot <<EOF cat > config/hooks/100-ubuntukylin.chroot <<EOF

8
live-build/ubuntu-cpc/hooks.d/chroot/100-preserve-apt-prefs.chroot Executable file
View File

@ -0,0 +1,8 @@
#! /bin/sh -ex
# live-build "helpfully" removes /etc/apt/preferences.d/* so we put a
# copy somewhere it won't touch it.
if [ -n "$(ls -A /etc/apt/preferences.d)" ]; then
cp -a /etc/apt/preferences.d /etc/apt/preferences.d.save
fi