# {{{ Read in boot parameters
if [ -z "$CMDLINE" ]; then
- # if CMDLINE was set from the outside, we're debugging. Otherwise, take
- # CMDLINE from Kernel and config files
+ # if CMDLINE was set from the outside, we're debugging.
+ # Otherwise, take CMDLINE from Kernel and config files.
CMDLINE="$(cat /proc/cmdline)"
- [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
+ [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
[ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
fi
# }}}
}
# }}}
-# {{{ Check for scripts on CD-ROM
-# this is also executed when the scripts option is called. Is this a bug
-# or intended?
-config_cdrom_scripts(){
-if checkbootparam "script"; then
- for script in "${LIVECD_PATH}"/scripts/* ; do
- einfo " grml script found on CD, executing ${WHITE}${script}${NORMAL}."
- . $script
- done
-fi
-}
-# }}}
-
# {{{ Sound
config_mixer(){
if ! [ -x /usr/bin/aumix ] ; then
else
einfo "Debs, config, scripts will be read from the CD image directly." ; eend 0
fi
-}
+}
config_partconf() {
if [ -n "$CONFIG" ]; then
if [ -d "${DCSDIR}/${CONFIG}" ] ; then
einfo "Taking configuration from directory ${DCSDIR}/${CONFIG}"
-
+
cp -a ${DCSDIR}/${CONFIG}/* /
elif [ -f "${DCSDIR}/${CONFIG}" ]; then
einfo "Extracting configuration from file ${DCSDIR}/${CONFIG}"