[SCM] live-initramfs branch, master, updated. debian/1.173.3-1-3-gdf42bf3

[Daniel Baumann]

The following commit has been merged in the master branch:
commit df42bf3f785f8c2edbd6d24a8b9ab3ccb2436ea9
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 12 18:07:36 2010 +0100

    Disabling kaboom (Closes: #556368).

diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/34disable_kaboom
similarity index 63%
copy from scripts/live-bottom/41apt_cdrom
copy to scripts/live-bottom/34disable_kaboom
index 00606d5..2bb474c 100755
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/34disable_kaboom
@@ -20,20 +20,16 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOAPTCDROM}" ]
-then
-	exit 0
-fi
-
 . /scripts/live-functions
 
-log_begin_msg "Adding APT-CDROM source"
+log_begin_msg "Disabling kaboom"
 
 # live-initramfs script
 
-if [ -d /root/cdrom ]
+if [ -e /root/etc/kde4 ]
 then
-	chroot /root apt-cdrom -m add
+	mkdir -p /root/home/${USERNAME}/.local
+	touch /root/home/${USERNAME}/.local/kaboom
 fi
 
 log_end_msg

-- 
live-initramfs