X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F41apt_cdrom;h=eb7fbd88bf01b8114628fb479754355cb8ee855b;hb=refs%2Ftags%2Fupstream%2F1.236.2;hp=97b2cdc2f1ea49c016ab08fb736840176da4a130;hpb=d70b77f919f85511936645abb95d710b80c10c74;p=live-boot-grml.git

diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom
index 97b2cdc..eb7fbd8 100755
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/41apt_cdrom
@@ -1,24 +1,47 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Adding APT-CDROM source..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-mkdir -p /root/cdrom
-mount -n -o bind /cdrom /root/cdrom
-chroot /root apt-cdrom -m add
-umount /root/cdrom
+# live-initramfs header
+
+if [ -n "${NOAPTCDROM}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Adding APT-CDROM source"
+
+# live-initramfs script
+
+if [ -d /root/cdrom ]
+then
+	mount -n -o bind /sys /root/sys
+	mount -n -o bind /proc /root/proc
+	mount -n -o bind /dev /root/dev
+
+	chroot /root apt-cdrom -o Acquire::cdrom::AutoDetect=false -m add
+
+	umount /root/dev
+	umount /root/proc
+	umount /root/sys
+fi
+
+log_end_msg