X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F41apt_cdrom;h=00606d5006f55ec02c8316db0ba75046c6c8a6ce;hb=116f7ddd2e6ebb1377474da592b7d43604e7b166;hp=bbfa845606cea87c5cd04183cccc7e7c82bddbd4;hpb=ccea277caf476cdfef4c0f953df5a97062d8be42;p=live-boot-grml.git

diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom
index bbfa845..00606d5 100755
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/41apt_cdrom
@@ -20,15 +20,20 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOAPTCDROM}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
-log_begin_msg "Adding APT-CDROM source..."
+log_begin_msg "Adding APT-CDROM source"
 
 # live-initramfs script
 
-mkdir -p /root/cdrom
-mount -n -o bind /cdrom /root/cdrom
-chroot /root apt-cdrom -m add
-umount /root/cdrom
+if [ -d /root/cdrom ]
+then
+	chroot /root apt-cdrom -m add
+fi
 
 log_end_msg