projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoiding echo bashism in live-initramfs.init by using printf instead (Closes: #530128).
[live-boot-grml.git]
/
scripts
/
live-bottom
/
41apt_cdrom
diff --git
a/scripts/live-bottom/41apt_cdrom
b/scripts/live-bottom/41apt_cdrom
index
bbfa845
..
00606d5
100755
(executable)
--- a/
scripts/live-bottom/41apt_cdrom
+++ b/
scripts/live-bottom/41apt_cdrom
@@
-20,15
+20,20
@@
esac
# live-initramfs header
# live-initramfs header
+if [ -n "${NOAPTCDROM}" ]
+then
+ exit 0
+fi
+
. /scripts/live-functions
. /scripts/live-functions
-log_begin_msg "Adding APT-CDROM source
...
"
+log_begin_msg "Adding APT-CDROM source"
# live-initramfs script
# 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
log_end_msg