Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-04 10:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.22 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 66e5f97cc14d68095798f6753a110de38a455990

New changelog entries:
  [ Adam Conrad ]
  * Switch a hardcoded "boot" to "$INITFS" in auto/build.
  [ Colin Watson ]
  * BuildLiveCD: Make sure livecd-rootfs is still installed in the chroot
    after the dist-upgrade.
This commit is contained in:
Colin Watson 2011-08-11 12:19:58 +01:00 committed by usd-importer
parent 66e5f97cc1
commit 2d155200d4
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BuildLiveCD
View File

@ -112,6 +112,7 @@ for STE in $SUITES; do
if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
fi
done
for STE in $SUITES; do

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (2.22) oneiric; urgency=low
[ Adam Conrad ]
* Switch a hardcoded "boot" to "$INITFS" in auto/build.
[ Colin Watson ]
* BuildLiveCD: Make sure livecd-rootfs is still installed in the chroot
after the dist-upgrade.
-- Colin Watson <cjwatson@ubuntu.com> Thu, 11 Aug 2011 12:19:58 +0100
livecd-rootfs (2.21) oneiric; urgency=low
* make sure ac100 images have universe enabled since the kernel lives there.

2
live-build/auto/build
View File

@ -129,7 +129,7 @@ if [ -e "binary/$INITFS/filesystem.packages" ]; then
fi
if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
# Not a typo, empty manifest-remove has a single LF in it. :/
if [ $(cat binary/boot/filesystem.packages-remove | wc -c) -gt 1 ]; then
if [ $(cat binary/$INITFS/filesystem.packages-remove | wc -c) -gt 1 ]; then
ln "binary/$INITFS/filesystem.packages-remove" "$PREFIX.manifest-remove"
chmod 644 "$PREFIX.manifest-remove"
fi