Remove grml2hd support

diff --git a/autoconfig b/autoconfig
index 3813cb1..9c1ee17 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -66,7 +66,6 @@ CONFIG_FINDDCSDIR='yes'       # search for a debs, config, scripts directory
 CONFIG_FIX_PASSWD='yes'       # fix unionfs-problem with passwd
 CONFIG_FIX_UNIONFS='yes'      # fix/workaround for unionfs
 CONFIG_FWTIMEOUT='yes'        # set timeout for firmware loading
 CONFIG_FIX_PASSWD='yes'       # fix unionfs-problem with passwd
 CONFIG_FIX_UNIONFS='yes'      # fix/workaround for unionfs
 CONFIG_FWTIMEOUT='yes'        # set timeout for firmware loading

-CONFIG_GRML2HD='yes'          # check for 'grml2hd' bootoption

 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD
 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD
 CONFIG_KERNEL='yes'           # display information on running kernel

diff --git a/autoconfig.functions b/autoconfig.functions
index 0f7b228..6fa4d37 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1970,58 +1970,6 @@ config_tohd()
 }
 # }}}
 
 }
 # }}}
 

-# {{{ grml2hd: automatic installation
-config_grml2hd(){
-
-if checkbootparam "grml2hd" || checkbootparam "BOOT_IMAGE=grml2hd" ; then
-
-if checkbootparam 'user' ; then
-   NEWUSER=''
-   NEWUSER="$(getbootparam 'user' 2>>$DEBUG)"
-   sed -i "s/^NEWUSER=.*/NEWUSER=$NEWUSER/" /etc/grml2hd/config || export GRML2HD_FAIL=1
-fi
-
-if checkbootparam 'filesystem' ; then
-   FILESYSTEM=''
-   FILESYSTEM="$(getbootparam 'filesystem' 2>>$DEBUG)"
-   sed -i "s/^FILESYSTEM=.*/FILESYSTEM=$FILESYSTEM/" /etc/grml2hd/config || export GRML2HD_FAIL=1
-fi
-
-if checkbootparam 'partition' ; then
-   PARTITION=''
-   PARTITION="$(getbootparam 'partition' 2>>$DEBUG)"
-   # notice: the following checks whether the given partition is available, if not the skip
-   # execution of grml2hd as it might result in data loss...
-   if [ -r $PARTITION ] ; then
-      sed -i "s#^PARTITION=.*#PARTITION=$PARTITION#" /etc/grml2hd/config || export GRML2HD_FAIL=1
-   else
-      ewarn "Partition $PARTITION does not exist. Skipping execution of grml2hd therefore." ; eend 1
-   fi
-fi
-
-if checkbootparam 'mbr' ; then
-   BOOT_PARTITION=''
-   BOOT_PARTITION="$(getbootparam 'mbr' 2>>$DEBUG)"
-   sed -i "s#^BOOT_PARTITION=.*#BOOT_PARTITION=$BOOT_PARTITION#" /etc/grml2hd/config || export GRML2HD_FAIL=1
-fi
-
-cat>|/usr/bin/grml2hd_noninteractive<<EOF
-#!/bin/sh
-GRML2HD_NONINTERACTIVE='yes' grml2hd
-EOF
-
-chmod 755 /usr/bin/grml2hd_noninteractive
-einfo "Bootoption grml2hd found. Running automatic installation via grml2hd using /etc/grml2hd/config." && eend 0
-if [ -z "$GRML2HD_FAIL" ] ; then
-   screen /usr/bin/grml2hd_noninteractive ; einfo "Invoking a shell, just exit to continue booting..." ; /bin/zsh
-else
-   ewarn "There was an error adjusting /etc/grml2hd/config. Skipping execution of grml2hd for security reasons." ; eend 1
-fi
-
-fi # if checkbootparam "BOOT_IMAGE=grml2hd ...
-}
-# }}}
-

 # {{{ debootstrap: automatic installation
 config_debootstrap(){
 
 # {{{ debootstrap: automatic installation
 config_debootstrap(){
 

diff --git a/debian/control b/debian/control
index 90b4b64..1181a49 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 Conflicts: grml-etc (<= 0.4-7), grml-saveconfig
 Replaces: grml-saveconfig
 Depends: ${shlibs:Depends}, ${misc:Depends}, acpid, udev (>= 0.080-1), zsh, gpm, rsyslog | system-log-daemon, kbd | console-utilities, console-terminus, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync, grml-network (>= 0.3.7)
 Conflicts: grml-etc (<= 0.4-7), grml-saveconfig
 Replaces: grml-saveconfig
 Depends: ${shlibs:Depends}, ${misc:Depends}, acpid, udev (>= 0.080-1), zsh, gpm, rsyslog | system-log-daemon, kbd | console-utilities, console-terminus, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync, grml-network (>= 0.3.7)

-Recommends: acpi-support, hwinfo, alsa-utils, mdadm, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)
+Recommends: acpi-support, hwinfo, alsa-utils, mdadm, aumix, locales, grml-debootstrap (>= 0.7)

 Description: main bootup process of a Grml (based) system
  grml-autoconfig is the main part of the bootup process of the
  grml system. This includes the hardware recognition system and
 Description: main bootup process of a Grml (based) system
  grml-autoconfig is the main part of the bootup process of the
  grml system. This includes the hardware recognition system and

diff --git a/grml-autoconfig b/grml-autoconfig
index 52f90ee..c8584b6 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -229,8 +229,6 @@ fi
 
 checkvalue $CONFIG_TOHD && config_tohd
 
 
 checkvalue $CONFIG_TOHD && config_tohd
 

-checkvalue $CONFIG_GRML2HD && config_grml2hd
-

 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
 checkvalue $CONFIG_XSTARTUP && config_x_startup
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
 checkvalue $CONFIG_XSTARTUP && config_x_startup