diff --git a/debian/changelog b/debian/changelog index 07343311..4462e223 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ livecd-rootfs (0.99) UNRELEASED; urgency=low * Rename EXTRASOURCE to PPA and also define PPAMIRROR near top, set to ppa.launchpad.net. Changing to PPA avoids listing non-main components in deb lines and having an useful comment in sources.list. + * Create an etc/apt/preferences file Pin-ing the PPA at 550 when there's + one. -- Loïc Minier Thu, 24 Sep 2009 11:52:25 +0200 diff --git a/livecd.sh b/livecd.sh index ebd2936f..91230b6f 100755 --- a/livecd.sh +++ b/livecd.sh @@ -382,6 +382,13 @@ Pin-Priority: 900 fi if [ -n "$PPA" ]; then echo deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main >> ${ROOT}etc/apt/sources.list + + touch ${ROOT}etc/apt/preferences + cat << @@EOF >> ${ROOT}etc/apt/preferences +Package: * +Pin: release o=LP-PPA-${PPA/\//-} +Pin-Priority: 550 +@@EOF fi chroot $ROOT apt-get update if [ "$FS" = "ubuntu-moblin-remix" ]; then @@ -499,6 +506,13 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse ## to create the base image of this system deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main deb-src http://$PPAMIRROR/$PPA/ubuntu ${STE} main +@@EOF + + touch ${ROOT}etc/apt/preferences + cat << @@EOF >> ${ROOT}etc/apt/preferences +Package: * +Pin: release o=LP-PPA-${PPA/\//-} +Pin-Priority: 550 @@EOF fi mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg