projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added tag 0.5-28 for changeset cbf09c00dd7f9c6060031db6c35e0427f077c172
[grml-autoconfig.git]
/
autoconfig.functions
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.
# 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
################################################################################
# {{{ path, variables, signals, umask, zsh
@@
-316,7
+316,13
@@
config_hostname(){
# fstabuser (needed when running from harddisk with username != grml {{{
config_userfstab(){
# 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'
}
# }}}
[ -n "$fstabuser" ] || fstabuser='grml'
}
# }}}