* config_userfstab: use new CONFIG_FSTAB_USER variable from

    /etc/grml/autoconfig
  * adjust configuration files for CONFIG_FSTAB_USER and
    CONFIG_FSTAB_GROUP supported by grml-rebuildfstab (>= 0.3-16).

diff --git a/autoconfig b/autoconfig
index 513703c..c2d0b1e 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -3,49 +3,46 @@
 # 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: Don Nov 16 20:20:59 CET 2006 [mika]
+# Latest change: Fre Nov 24 21:19:55 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
 # Notice: you can configure grml-autoconfig via adjusting the following values.
-# Set them to 'yes' to activate them. But please notice that some options
-# require an additional bootparam ("cheatcode") anyway, some options just
-# de-/activate a check!
-#
-# If you want to deactivate an option just set it to 'no'.
+# Set them to 'yes' to activate them and to 'no' to deactivate them.
+# But please notice that some options might require an additional bootparam
+# ("cheatcode") anyway, some options just de-/activate a check!
 #
 # Take a look at the script 'grml-autoconfig' as well!
 ################################################################################
 
 ## These are the options you might want to adjust: #############################
 
-# configure language - set keyboard layout
-# notice: overwriting this variable is still possible through
-#         bootparameter lang=...
-# See http://grml.org/faq/#language for more information.
-# default: us
-# LANGUAGE='de'
-
-# console font
-# default: Lat15-Terminus16
+# set console font, default: Lat15-Terminus16
 # CONSOLEFONT='iso15graf-16'
 
-# check for network devices and run dhclient
+# check for network devices and run pump for every present network device?
+# use script grml-network for interactive configuration and
+# /etc/network/interfaces for persistent configuration
+# default: yes
 CONFIG_DHCP='yes'
 
-# check for frequency-scalable CPU and activate cpydyn/powernowd
+# check for frequency-scalable CPU and activate cpydyn/powernowd (default: yes)
 CONFIG_CPU='yes'
 
-# create /etc/fstab (this also de-/activates swap-partition)
+# create/regenerate /etc/fstab using [grml-]rebuildfstab?
 CONFIG_FSTAB='yes'
+# define uid for rebuildfstab used in /etc/fstab (default: 1000):
+CONFIG_FSTAB_USER='1000'
+# define guid for rebuildfstab used in /etc/fstab (default: users):
+CONFIG_FSTAB_GROUP='users'
 
-# load ACPI/APM modules
+# load ACPI/APM modules (default: yes)
 CONFIG_ACPI_APM='yes'
 
-# start syslog-ng
+# start syslog-ng (default: yes)
 CONFIG_SYSLOG='yes'
 
-# start gpm
+# start gpm (default: yes)
 CONFIG_GPM='yes'
 
 ################################################################################

diff --git a/autoconfig.functions b/autoconfig.functions
index 03e4aac..1594b2d 100755 (executable)
--- 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: Fre Nov 10 00:33:15 CET 2006 [mika]
+# Latest change: Fre Nov 24 21:24:22 CET 2006 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -316,7 +316,13 @@ config_hostname(){
 
 # fstabuser (needed when running from harddisk with username != grml {{{
 config_userfstab(){
-  fstabuser=$(getent passwd 1000 | cut -d: -f1)
+  [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig
+  if [ -n "$CONFIG_FSTAB_USER" ] ; then
+     fstabuser="$CONFIG_FSTAB_USER"
+  else
+     fstabuser=$(getent passwd 1000 | cut -d: -f1)
+  fi
+  # if not yet set fall back to default 'grml' user
   [ -n "$fstabuser" ] || fstabuser='grml'
 }
 # }}}

diff --git a/autoconfig.small b/autoconfig.small
index 8de1b73..f0dc417 100644 (file)
--- a/autoconfig.small
+++ b/autoconfig.small
@@ -3,49 +3,46 @@
 # 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: Don Nov 16 20:20:59 CET 2006 [mika]
+# Latest change: Fre Nov 24 21:20:51 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
 # Notice: you can configure grml-autoconfig via adjusting the following values.
-# Set them to 'yes' to activate them. But please notice that some options
-# require an additional bootparam ("cheatcode") anyway, some options just
-# de-/activate a check!
-#
-# If you want to deactivate an option just set it to 'no'.
+# Set them to 'yes' to activate them and to 'no' to deactivate them.
+# But please notice that some options might require an additional bootparam
+# ("cheatcode") anyway, some options just de-/activate a check!
 #
 # Take a look at the script 'grml-autoconfig' as well!
 ################################################################################
 
 ## These are the options you might want to adjust: #############################
 
-# configure language - set keyboard layout
-# notice: overwriting this variable is still possible through
-#         bootparameter lang=...
-# See http://grml.org/faq/#language for more information.
-# default: us
-# LANGUAGE='de'
-
-# console font
-# default: Lat15-Terminus16
+# set console font, default: Lat15-Terminus16
 # CONSOLEFONT='iso15graf-16'
 
-# check for network devices and run dhclient
+# check for network devices and run pump for every present network device?
+# use script grml-network for interactive configuration and
+# /etc/network/interfaces for persistent configuration
+# default: yes
 CONFIG_DHCP='yes'
 
-# check for frequency-scalable CPU and activate cpydyn/powernowd
+# check for frequency-scalable CPU and activate cpydyn/powernowd (default: no)
 CONFIG_CPU='no'
 
-# create /etc/fstab (this also de-/activates swap-partition)
+# create/regenerate /etc/fstab using [grml-]rebuildfstab?
 CONFIG_FSTAB='yes'
+# define uid for rebuildfstab used in /etc/fstab (default: 1000):
+CONFIG_FSTAB_USER='1000'
+# define guid for rebuildfstab used in /etc/fstab (default: users):
+CONFIG_FSTAB_GROUP='users'
 
-# load ACPI/APM modules
+# load ACPI/APM modules (default: yes)
 CONFIG_ACPI_APM='yes'
 
-# start syslog-ng
+# start syslog-ng (default: yes)
 CONFIG_SYSLOG='yes'
 
-# start gpm
+# start gpm (default: yes)
 CONFIG_GPM='yes'
 
 ################################################################################

diff --git a/debian/changelog b/debian/changelog
index d4dc0c2..ec279db 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-autoconfig (0.5-28) unstable; urgency=low
+
+  * config_userfstab: use new CONFIG_FSTAB_USER variable from
+    /etc/grml/autoconfig
+  * adjust configuration files for CONFIG_FSTAB_USER and
+    CONFIG_FSTAB_GROUP supported by grml-rebuildfstab (>= 0.3-16).
+
+ -- Michael Prokop <mika@grml.org>  Fri, 24 Nov 2006 21:24:40 +0100
+
 grml-autoconfig (0.5-27) unstable; urgency=low
 
   * Use LANGUAGE="en" instead of LANGUAGE="us" for lang=en*,