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

Import patches-unapplied version 0.87 to ubuntu/karmic

Browse Source 
Imported using git-ubuntu import.

Changelog parent: f44fd3cf4e2367ccbe4a3f0f1bbb73d9441617e7

New changelog entries:
  [ Timo Aaltonen ]
  * livecd.sh: Don't mess with xorg.conf anymore, we don't install one
    by default.
  [ Colin Watson ]
  * Clean up the chroot tree before trying to remove it, just in case
    there's some leftover junk from a previous failed build.
This commit is contained in:
Colin Watson 2009-07-07 13:07:47 +01:00 committed by usd-importer
parent f44fd3cf4e
commit 350c154c6e
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
livecd-rootfs (0.87) karmic; urgency=low
[ Timo Aaltonen ]
* livecd.sh: Don't mess with xorg.conf anymore, we don't install one
by default.
[ Colin Watson ]
* Clean up the chroot tree before trying to remove it, just in case
there's some leftover junk from a previous failed build.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 07 Jul 2009 13:07:47 +0100
livecd-rootfs (0.86) karmic; urgency=low livecd-rootfs (0.86) karmic; urgency=low
[ Scott Kitterman ] [ Scott Kitterman ]

6
livecd.sh
View File

@ -160,6 +160,9 @@ for FS in "$@"; do
select_mirror select_mirror
# Just in case there's some leftover junk here:
cleanup 2>/dev/null || true
rm -rf ${ROOT} rm -rf ${ROOT}
mkdir -p ${ROOT}var/cache/debconf mkdir -p ${ROOT}var/cache/debconf
@ -472,9 +475,6 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
# 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
rm -f ${ROOT}etc/X11/xorg.conf
# Restore an empty xorg.conf, else xserver-xorg postinst will be confused
touch ${ROOT}etc/X11/xorg.conf
rm -f ${ROOT}var/lib/apt/lists/*_* rm -f ${ROOT}var/lib/apt/lists/*_*
rm -f ${ROOT}var/spool/postfix/maildrop/* rm -f ${ROOT}var/spool/postfix/maildrop/*
# Removing update-notifier notes is now considered harmful: # Removing update-notifier notes is now considered harmful: