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.148.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
21xvidemode
diff --git
a/scripts/live-bottom/21xvidemode
b/scripts/live-bottom/21xvidemode
index
27d943e
..
23eb212
100755
(executable)
--- a/
scripts/live-bottom/21xvidemode
+++ b/
scripts/live-bottom/21xvidemode
@@
-1,30
+1,46
@@
#!/bin/sh
#!/bin/sh
-PREREQ=""
-DESCRIPTION="Configuring X kludges..."
+#set -e
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
prereqs()
{
prereqs()
{
- echo "$
PREREQ
"
+ echo "$
{PREREQ}
"
}
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+if [ -n "${NOXAUTOCONFIG}" ]
+then
+ exit 0
+fi
+
+if [ ! -x /root/usr/bin/X ]
+then
+ exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Configuring X video modes"
+
+# live-initramfs script
if [ -n "$XVIDEOMODE" ]
then
if [ -n "$XVIDEOMODE" ]
then
- mount -
n -
o bind /sys /root/sys
- mount -
n -
o bind /proc /root/proc
- mount -
n -
o bind /dev /root/dev
+ mount -o bind /sys /root/sys
+ mount -o bind /proc /root/proc
+ mount -o bind /dev /root/dev
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}