X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=1594b2db6b32b5e9a7f82f7813bb4c388f6c651d;hp=03e4aac78367e63eaf965d369ef291aa8cb362f4;hb=18ce62a4689903fe6a113dfd667ff5d4c148b1bf;hpb=24cdc08ddb22a13bc6296c85d3f749097c51ee0e diff --git a/autoconfig.functions b/autoconfig.functions index 03e4aac..1594b2d 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper , (c) Michael Prokop # 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' } # }}}