[Debian-live-changes] r2416 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-07 07:26:00 +0000 (Sat, 07 Jul 2007)
New Revision: 2416

Modified:
   dists/trunk/live-helper/helpers/lh_binary_linux-image
   dists/trunk/live-helper/helpers/lh_chroot_hacks
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-07-06 23:07:04 UTC (rev 2415)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-07-07 07:26:00 UTC (rev 2416)
@@ -46,9 +46,6 @@
 # Creating lock file
 Create_lockfile .lock
 
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
 	iso)

Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-07-06 23:07:04 UTC (rev 2415)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-07-07 07:26:00 UTC (rev 2416)
@@ -90,6 +90,8 @@
 rm -f chroot/etc/X11/xorg.conf
 
 # Remove cruft
+rm -f chroot/boot/initrd*bak*
+rm -f /etc/apt/trusted.gpg~
 rm -f chroot/etc/group- chroot/etc/passwd-
 rm -f chroot/etc/gshadow- chroot/etc/shadow-
 rm -f chroot/var/cache/debconf/*-old