projects
/
grml-x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
438b508
)
use getBootParam instead of getbootparam again
author
Michael Prokop
<mika@grml.org>
Mon, 26 Mar 2007 20:19:58 +0000
(22:19 +0200)
committer
Michael Prokop
<mika@grml.org>
Mon, 26 Mar 2007 20:19:58 +0000
(22:19 +0200)
grml-x
patch
|
blob
|
history
diff --git
a/grml-x
b/grml-x
index
2838769
..
243951d
100755
(executable)
--- a/
grml-x
+++ b/
grml-x
@@
-4,7
+4,7
@@
# 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.
# 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: Mon Mär 26 22:1
1:44
CEST 2007 [mika]
+# Latest change: Mon Mär 26 22:1
9:37
CEST 2007 [mika]
################################################################################
# debugging {{{
################################################################################
# debugging {{{
@@
-21,11
+21,12
@@
[ -r /etc/grml_colors ] && . /etc/grml_colors
fi
[ -r /etc/grml_colors ] && . /etc/grml_colors
fi
- # some functions like get
bootp
aram
- if [ -r /etc/grml/script-functions ] ; then
+ # some functions like get
BootP
aram
+ if [ -r /etc/grml/script-functions
-a -r /etc/grml/sh-lib
] ; then
source /etc/grml/script-functions
source /etc/grml/script-functions
+ source /etc/grml/sh-lib
else
else
- echo 'Error: sourcing
/etc/grml/script-function
s failed. Exiting.'
+ echo 'Error: sourcing
function file
s failed. Exiting.'
exit 1
fi
exit 1
fi
@@
-490,7
+491,7
@@
parse_options()
# module handling
MODULE=$o_module[2]
if [ -z "$MODULE" ] ; then
# module handling
MODULE=$o_module[2]
if [ -z "$MODULE" ] ; then
- MODULE="$(get
bootp
aram xmodule 2>/dev/null)"
+ MODULE="$(get
BootP
aram xmodule 2>/dev/null)"
if [ -z "$MODULE" ] ; then
MODULE=$(grep 'XFree86 v4 Server Module:' "${HWINFO_TMP}" | head -1 | awk '{print $5}')
if [ -z "$MODULE" ] ; then
if [ -z "$MODULE" ] ; then
MODULE=$(grep 'XFree86 v4 Server Module:' "${HWINFO_TMP}" | head -1 | awk '{print $5}')
if [ -z "$MODULE" ] ; then
@@
-510,7
+511,7
@@
parse_options()
MODE=$o_mode[2]
if [ -z $MODE ] ; then
MODE=$o_mode[2]
if [ -z $MODE ] ; then
- B_MODE="$(get
bootp
aram xmode 2>/dev/null)"
+ B_MODE="$(get
BootP
aram xmode 2>/dev/null)"
if [ -n "$B_MODE" ] ; then
MODES="Modes \"$B_MODE\""
FORCE="yes"
if [ -n "$B_MODE" ] ; then
MODES="Modes \"$B_MODE\""
FORCE="yes"