drop $CMDLINE from grml-autoconfig; it's initialized from within autoconfig.functions

diff --git a/debian/changelog b/debian/changelog
index b9784d3..e096620 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ grml-autoconfig (0.8.25) UNRELEASED; urgency=low
     Bugreport and path by Julian Langschädel, thanks!
   * Streamline calls of bootparams-functions, single quotes everywhere.
     Patch by Marc Haber, thanks!
     Bugreport and path by Julian Langschädel, thanks!
   * Streamline calls of bootparams-functions, single quotes everywhere.
     Patch by Marc Haber, thanks!

+  * Don't print the "Debs, config, scripts will be read from the live
+    image directly." message if no debs, config or scripts option
+    was given on the command line. Thanks for the patch, Marc Haber!

 
 

- -- Michael Prokop <mika@grml.org>  Tue, 11 Aug 2009 11:19:28 +0200
+ -- Michael Prokop <mika@grml.org>  Tue, 11 Aug 2009 11:27:30 +0200

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

diff --git a/grml-autoconfig b/grml-autoconfig
index 7d7b3ac..f57a890 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -53,12 +53,6 @@ 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