From: Michael Prokop <mika@grml.org>
Date: Thu, 6 Sep 2007 22:20:47 +0000 (+0200)
Subject: Drop support for (deprecated) bootoption expert
X-Git-Tag: 0.7.17~1
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=bff0d22e5765c0b8f146ede7311bb55fb26d4aaa;ds=sidebyside

Drop support for (deprecated) bootoption expert
---

diff --git a/autoconfig b/autoconfig
index 1e82864..ef556e7 100644
--- a/autoconfig
+++ b/autoconfig
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Jul 25 18:58:58 CEST 2007 [mika]
+# Latest change: Don Sep 06 23:57:14 CEST 2007 [mika]
 ################################################################################
 
 ################################################################################
@@ -81,7 +81,6 @@ CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
 CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HWINFO='no'            # run hwinfo for module-detection (requires bootparam 'hwinfo'!)
 CONFIG_IPW3945='yes'          # check for broken ipw3945 module
-CONFIG_INTERACTIVE='yes'      # check for expert-mode as bootparam
 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_LANGUAGE='yes'         # allow language specification via commandline
 CONFIG_LD_MOD='yes'           # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing
diff --git a/autoconfig.functions b/autoconfig.functions
index 1364af4..f4cb8fc 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Sep 05 19:09:45 CEST 2007 [mika]
+# Latest change: Don Sep 06 23:57:02 CEST 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -157,11 +157,6 @@ fi
 }
 # }}}
 
-# {{{ Check if we are in interactive startup mode
-INTERACTIVE=""
-stringinstring "BOOT_IMAGE=expert " "$CMDLINE" && INTERACTIVE="yes"
-# }}}
-
 # {{{ set firmware timeout via bootparam
 config_fwtimeout(){
  if checkbootparam fwtimeout ; then
@@ -884,24 +879,8 @@ fi
 
 # {{{ Interactive configuration
 config_interactive(){
-if [ -n "$INTERACTIVE" ] ; then
-einfo "Entering interactive configuration second stage."
-
-  echo " ${GREEN}Your console keyboard defaults to: ${MAGENTA}${KEYTABLE}"
-  echo -n "${CYAN}Do you want to (re)configure your console keyboard?${NORMAL} [Y/n] "
-  read a
-  [ "$a" != "n" ] && /usr/sbin/dpkg-reconfigure console-data ; eend $?
-
-  echo -n "${CYAN}Do you want to (re)configure your soundcard?${NORMAL} [Y/n] "
-  read a
-  [ "$a" != "n" ] && alsaconf && ( exec aumix -m 0 >>$DEBUG 2>&1 & ) ; eend $?
-
-  echo -n "${CYAN}Do you want to (re)configure your graphics (X11) subsystem?${NORMAL} [Y/n] "
-  read a
-  [ "$a" != "n" ] && xorgcfg -textmode ; eend $?
-  echo " ${GREEN}Interactive configuration finished. Everything else should be fine for now.${NORMAL}"
-fi
-eend 0
+  ewarn "config_interactive is deprecated nowadays."
+  ewarn "Please set CONFIG_INTERACTIVE='no' in /etc/grml/autoconfig" ; eend 0
 }
 # }}}
 
diff --git a/autoconfig.small b/autoconfig.small
index c019bfe..1ddc961 100644
--- a/autoconfig.small
+++ b/autoconfig.small
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Jul 25 18:58:57 CEST 2007 [mika]
+# Latest change: Don Sep 06 23:57:08 CEST 2007 [mika]
 ################################################################################
 
 ################################################################################
@@ -81,7 +81,6 @@ CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
 CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HWINFO='no'            # run hwinfo for module-detection (requires bootparam 'hwinfo'!)
 CONFIG_IPW3945='yes'          # check for broken ipw3945 module
-CONFIG_INTERACTIVE='yes'      # check for expert-mode as bootparam
 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_LANGUAGE='yes'         # allow language specification via commandline
 CONFIG_LD_MOD='yes'           # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing
diff --git a/debian/changelog b/debian/changelog
index 44cb7e7..54c1f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.7.16) unstable; urgency=low
+
+  * Drop support for (deprecated) bootoption 'expert'.
+
+ -- Michael Prokop <mika@grml.org>  Fri,  7 Sep 2007 00:20:27 +0200
+
 grml-autoconfig (0.7.15) unstable; urgency=low
 
   * config_language(): check for existence of /etc/sysconfig/keyboard