Drop support for /etc/grml/autoconfig.small; support /live/image/bootparams/ again

diff --git a/debian/changelog b/debian/changelog
index 4782941..b1fce17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 grml-autoconfig (0.8.18) unstable; urgency=low
 
 grml-autoconfig (0.8.18) unstable; urgency=low
 

+  * Drop support for /etc/grml/autoconfig.small. It causes
+    more headaches and work than beneftig. Instead make sure
+    to properly support grml-small in the "grml-large"
+    configuration. [Testing: issue573]

   * Change forensic bootoption handling, as we add 'forensic' to
     the kernel append line as well.
   * Change forensic bootoption handling, as we add 'forensic' to
     the kernel append line as well.

+  * Make sure to proberly support /live/image/bootparams/ again.

 
 

- -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 18:24:36 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 18:54:33 +0100

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

diff --git a/debian/rules b/debian/rules
index f42603c..da2d757 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ install: build
        # Add here commands to install the package into debian/grml-autoconfig.
        install -m 755 grml-autoconfig      debian/grml-autoconfig/etc/init.d/grml-autoconfig
        install -m 644 autoconfig           debian/grml-autoconfig/etc/grml/autoconfig
        # Add here commands to install the package into debian/grml-autoconfig.
        install -m 755 grml-autoconfig      debian/grml-autoconfig/etc/init.d/grml-autoconfig
        install -m 644 autoconfig           debian/grml-autoconfig/etc/grml/autoconfig

-       install -m 644 autoconfig.small     debian/grml-autoconfig/etc/grml/autoconfig.small

        install -m 755 autoconfig.functions debian/grml-autoconfig/etc/grml/autoconfig.functions
        install -m 644 language-functions   debian/grml-autoconfig/etc/grml/language-functions
        install -m 755 sbin/grml-autoconfig debian/grml-autoconfig/usr/sbin/grml-autoconfig
        install -m 755 autoconfig.functions debian/grml-autoconfig/etc/grml/autoconfig.functions
        install -m 644 language-functions   debian/grml-autoconfig/etc/grml/language-functions
        install -m 755 sbin/grml-autoconfig debian/grml-autoconfig/usr/sbin/grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 8c69443..2c97dbc 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -56,6 +56,7 @@ mount_sys
 # {{{ Read in boot parameters
 CMDLINE="$(cat /proc/cmdline)"
 [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
 # {{{ 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
 # }}}
 
 # {{{ main grml-autoconfig


@@ -290,6 +291,7 @@ fi
 if [ -n "$BOOTDEBUG" ] ; then
    CMDLINE="$(cat /proc/cmdline)"
    [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
 if [ -n "$BOOTDEBUG" ] ; then
    CMDLINE="$(cat /proc/cmdline)"
    [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"

+   [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"

    einfo "Bootoption debug detected. Printing kernel command line:"
    echo "$CMDLINE"
 fi
    einfo "Bootoption debug detected. Printing kernel command line:"
    echo "$CMDLINE"
 fi

diff --git a/man/grml-autoconfig.8 b/man/grml-autoconfig.8
index b57b395..d3eb5f4 100644 (file)
--- a/man/grml-autoconfig.8
+++ b/man/grml-autoconfig.8
@@ -1,4 +1,4 @@
-.TH GRML-AUTOCONFIG 8 "June 4, 2006"
+.TH GRML-AUTOCONFIG 8

 .SH NAME
 grml-autoconfig \- script and configuration framework for the grml system
 .SH SYNOPSIS
 .SH NAME
 grml-autoconfig \- script and configuration framework for the grml system
 .SH SYNOPSIS


@@ -48,10 +48,9 @@ after checking configuration file /etc/grml/autoconfig.
 Dialog interface to the configuration file /etc/grml/autoconfig.
 .PP
 .RE
 Dialog interface to the configuration file /etc/grml/autoconfig.
 .PP
 .RE

-.I /etc/grml/autoconfig{.small}
+.I /etc/grml/autoconfig

 .RS
 .RS

-Configuration file for grml-autoconfig framework. On grml-small the configuration
-file is named /etc/grml/autoconfig.small. You can either edit this configuration
+Configuration file for grml-autoconfig framework. You can either edit this configuration

 file manually of use the dialog interface /usr/sbin/grml-autoconfig.
 .PP
 .RE
 file manually of use the dialog interface /usr/sbin/grml-autoconfig.
 .PP
 .RE