Drop config_cdrom_scripts(); some formating cleanups

diff --git a/autoconfig b/autoconfig
index 36fcfae..363fa80 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -55,7 +55,6 @@ CONFIG_BLANKING='yes'         # check for bootoption noblank to disable console
 CONFIG_BLINDSOUND='yes'       # play 'beep' and play welcome message
 CONFIG_BLIND='yes'            # check for blind option or brltty
 CONFIG_CDROM_PERM='yes'       # for burning on IDE-CD-Roms, k3b (and others) check for special permissions
 CONFIG_BLINDSOUND='yes'       # play 'beep' and play welcome message
 CONFIG_BLIND='yes'            # check for blind option or brltty
 CONFIG_CDROM_PERM='yes'       # for burning on IDE-CD-Roms, k3b (and others) check for special permissions

-CONFIG_CDROM_SCRIPTS='no'    # run scripts from /cdrom/scripts

 CONFIG_CONFIG='yes'          # do we want config unpacking to work?
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
 CONFIG_CREATE_MNT_DIRS='no'   # create /mnt-directories
 CONFIG_CONFIG='yes'          # do we want config unpacking to work?
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
 CONFIG_CREATE_MNT_DIRS='no'   # create /mnt-directories

diff --git a/autoconfig.functions b/autoconfig.functions
index e4fe0eb..35bffaa 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -34,10 +34,10 @@ iszsh && setopt no_nomatch # || echo "Warning: not running under zsh!"
 
 # {{{ Read in boot parameters
 if [ -z "$CMDLINE" ]; then
 
 # {{{ 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)"
   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
 # }}}
   [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
 fi
 # }}}


@@ -1590,19 +1590,6 @@ fi # checkbootparam home
 }
 # }}}
 
 }
 # }}}
 

-# {{{ 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
 # {{{ Sound
 config_mixer(){
 if ! [ -x /usr/bin/aumix ] ; then

diff --git a/debian/changelog b/debian/changelog
index e5ff418..dd60be5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,10 @@ grml-autoconfig (0.8.24) unstable; urgency=low
     - If myconfig=foo is set on the command line, $dcs-dir is set to
       foo, even if a GRMLCFG partition is present.
     [Testing: issue715]
     - If myconfig=foo is set on the command line, $dcs-dir is set to
       foo, even if a GRMLCFG partition is present.
     [Testing: issue715]

+  * Drop config_cdrom_scripts(): the bootoption "script" is triggered
+    by bootoption "scripts" and was never officially documented.

 
 

- -- Michael Prokop <mika@grml.org>  Wed, 05 Aug 2009 15:21:14 +0200
+ -- Michael Prokop <mika@grml.org>  Wed, 05 Aug 2009 15:30:25 +0200

 
 grml-autoconfig (0.8.23) unstable; urgency=low
 
 
 grml-autoconfig (0.8.23) unstable; urgency=low
 

diff --git a/grml-autoconfig b/grml-autoconfig
index 7e46b47..176a04b 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -53,6 +53,12 @@ mount_pts
 mount_sys
 # }}}
 
 mount_sys
 # }}}
 

+# {{{ Read in boot parameters
+CMDLINE="$(cat /proc/cmdline)"
+[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
+[ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
+# }}}
+

 # {{{ main grml-autoconfig
 checkvalue $CONFIG_DEBUG && config_debug
 
 # {{{ main grml-autoconfig
 checkvalue $CONFIG_DEBUG && config_debug
 


@@ -212,8 +218,6 @@ checkvalue $CONFIG_PARTCONF && config_partconf
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
 
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
 

-checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
-

 # device symlinks {{{
   [ -r /mnt/floppy ] || mkdir /mnt/floppy
   [ -r /mnt/cdrom ]  || mkdir /mnt/cdrom
 # device symlinks {{{
   [ -r /mnt/floppy ] || mkdir /mnt/floppy
   [ -r /mnt/cdrom ]  || mkdir /mnt/cdrom