projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Extend 'Ignoring swap partition'-message for new default
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
344929b
..
8305199
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:
Mon Nov 27 21:02:23
CET 2006 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
################################################################################
# {{{ path, variables, signals, umask, zsh
@@
-89,6
+89,7
@@
mount_sys(){
# }}}
# {{{ Read in boot parameters
# }}}
# {{{ Read in boot parameters
+[ -f /proc/version ] || mount_proc # make sure we can access /proc/cmdline when sourcing this file too
CMDLINE="$(cat /proc/cmdline)"
[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
# }}}
CMDLINE="$(cat /proc/cmdline)"
[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
# }}}
@@
-315,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'
}
# }}}
@@
-957,7
+964,7
@@
if [ -n "$partitions" ]; then
case "$f" in swap)
eindent
if [ -n "$NOSWAP" ]; then
case "$f" in swap)
eindent
if [ -n "$NOSWAP" ]; then
- ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}
as requested.
" ; eend 0
+ ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}
. (Force usage via boot option 'swap', or execute grml-swapon)
" ; eend 0
else
case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
S1SUSP|S2SUSP|pmdisk|[zZ]*)
else
case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
S1SUSP|S2SUSP|pmdisk|[zZ]*)
@@
-1902,7
+1909,7
@@
config_swraid(){
if ! grep -q ARRAY /etc/mdadm/mdadm.conf 2>>$DEBUG ; then
einfo "Creating /etc/mdadm/mdadm.conf"
[ -r /etc/mdadm/mdadm.conf ] && mv /etc/mdadm/mdadm.conf /etc/mdadm/mdadm.conf.old
if ! grep -q ARRAY /etc/mdadm/mdadm.conf 2>>$DEBUG ; then
einfo "Creating /etc/mdadm/mdadm.conf"
[ -r /etc/mdadm/mdadm.conf ] && mv /etc/mdadm/mdadm.conf /etc/mdadm/mdadm.conf.old
- MDADM_MAILADDR='root' /usr/share/mdadm/mkconf > /etc/mdadm/mdadm.conf ; eend $?
+ MDADM_MAILADDR
__
='root' /usr/share/mdadm/mkconf > /etc/mdadm/mdadm.conf ; eend $?
else
ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0
fi
else
ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0
fi