projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.110.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
20xconfig
diff --git
a/scripts/live-bottom/20xconfig
b/scripts/live-bottom/20xconfig
index
902335e
..
779a1c2
100755
(executable)
--- a/
scripts/live-bottom/20xconfig
+++ b/
scripts/live-bottom/20xconfig
@@
-31,10
+31,15
@@
log_begin_msg "Configuring X..."
# live-initramfs script
# live-initramfs script
-if [ "$
TERM_TYPE
" = "serial" ]
+if [ "$
{TERM_TYPE}
" = "serial" ]
then
# Don't bother trying to configure or start X on a serial console
then
# Don't bother trying to configure or start X on a serial console
- rm -f /etc/rc?.d/S??[gxk]dm
+ rm -f /root/etc/rc?.d/S??[gkx]dm
+ exit 0
+fi
+
+if [ -n "${TEXTONLY}" ]
+then
exit 0
fi
exit 0
fi