Drop unused update_progress() + /etc/sysconfig/grml

diff --git a/autoconfig.functions b/autoconfig.functions
index cfd8366..45604c9 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -435,13 +435,6 @@ fi
 }
 # }}}
 
 }
 # }}}
 

-# update_progress {{{
-update_progress(){
-  # be sure we are non-blocking
-  (echo "$1" > /etc/sysconfig/progress) &
-}
-# }}}
-

 # {{{ timezone
 config_timezone(){
  # don't touch the files if running from harddisk:
 # {{{ timezone
 config_timezone(){
  # don't touch the files if running from harddisk:

diff --git a/debian/changelog b/debian/changelog
index 6cd6abb..fd71c05 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.7.31) unstable; urgency=low
+
+  * Drop unused update_progress() and no longer read in
+    /etc/sysconfig/grml.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 20 Nov 2007 21:42:56 +0100
+

 grml-autoconfig (0.7.30) unstable; urgency=low
 
   * Make sure to switch to the original tty when running
 grml-autoconfig (0.7.30) unstable; urgency=low
 
   * Make sure to switch to the original tty when running

diff --git a/grml-autoconfig b/grml-autoconfig
index 8b63ea1..83cb54f 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -176,10 +176,6 @@ checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
 checkvalue $CONFIG_PCMCIA && config_pcmcia
 
 
 checkvalue $CONFIG_PCMCIA && config_pcmcia
 

-# {{{ Read in what hwsetup has found
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-# }}}
-

 checkvalue $CONFIG_KEYBOARD && config_keyboard
 
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
 checkvalue $CONFIG_KEYBOARD && config_keyboard
 
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14


@@ -190,8 +186,6 @@ checkvalue $CONFIG_INTERACTIVE && config_interactive
 
 checkvalue $CONFIG_AGP && config_agp
 
 
 checkvalue $CONFIG_AGP && config_agp
 

-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-

 checkvalue $CONFIG_AUTOMOUNTER && config_automounter
 
 checkvalue $CONFIG_DMA && config_dma
 checkvalue $CONFIG_AUTOMOUNTER && config_automounter
 
 checkvalue $CONFIG_DMA && config_dma