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

Import patches-unapplied version 1.152 to ubuntu/maverick

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 7c2b097ba1d51508388d16a014bdde13ebe2a373

New changelog entries:
  * livecd.sh:
    - Restore the keyring earlier in the chroot (before the dist-upgrade).
      This fixes the missng key for the extras.ubuntu.com that is added
      during the livecd build dist-ugprade (LP: #650525)
This commit is contained in:
Michael Vogt 2010-09-30 14:32:57 +02:00 committed by usd-importer
parent 7c2b097ba1
commit ce1bd42742
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (1.152) maverick; urgency=low
* livecd.sh:
- Restore the keyring earlier in the chroot (before the dist-upgrade).
This fixes the missng key for the extras.ubuntu.com that is added
during the livecd build dist-ugprade (LP: #650525)
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Sep 2010 14:32:57 +0200
livecd-rootfs (1.151) maverick; urgency=low livecd-rootfs (1.151) maverick; urgency=low
* enforce installation of only suitable header packages for the respective * enforce installation of only suitable header packages for the respective

6
livecd.sh
View File

@ -507,7 +507,12 @@ Pin-Priority: 900
cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$ cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
# update and immediately restore the trusted keyring
chroot $ROOT apt-get update chroot $ROOT apt-get update
# we restore the keyring here because on dist-upgrade the
# ubuntu-extras-keyring package installs additional keys
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
checkpoint "Upgrading" checkpoint "Upgrading"
chroot $ROOT apt-get -y $FORCE_YES --purge dist-upgrade </dev/null chroot $ROOT apt-get -y $FORCE_YES --purge dist-upgrade </dev/null
checkpoint "Installing main packages" checkpoint "Installing main packages"
@ -645,7 +650,6 @@ Pin: release o=LP-PPA-$origin
Pin-Priority: 550 Pin-Priority: 550
@@EOF @@EOF
fi fi
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
# get rid of the .debs - we don't need them. # get rid of the .debs - we don't need them.
chroot ${ROOT} apt-get clean chroot ${ROOT} apt-get clean