projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 1.136.3.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
41apt_cdrom
diff --git
a/scripts/live-bottom/41apt_cdrom
b/scripts/live-bottom/41apt_cdrom
index
97b2cdc
..
63da284
100755
(executable)
--- a/
scripts/live-bottom/41apt_cdrom
+++ b/
scripts/live-bottom/41apt_cdrom
@@
-1,24
+1,36
@@
-#!
/bin/sh
+#!/bin/sh
-PREREQ=""
-DESCRIPTION="Adding APT-CDROM source..."
+#set -e
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
prereqs()
{
prereqs()
{
- echo "$
PREREQ
"
+ echo "$
{PREREQ}
"
}
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
esac
-mkdir -p /root/cdrom
-mount -n -o bind /cdrom /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
+
chroot /root apt-cdrom -m add
chroot /root apt-cdrom -m add
-umount /root/cdrom
+
+log_end_msg