X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xvidemode;h=ac28fad580b74712ee8f822ef38f1fb6f462ff3f;hb=3260fec82497dccb9633ef344dfa06d8dc718163;hp=1312530785fa2439f76a0798063a3e3b287d4a4b;hpb=62f9e4e66f78e4a3bba7cd438b15b790f60954df;p=live-boot-grml.git diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode index 1312530..ac28fad 100755 --- a/scripts/live-bottom/21xvidemode +++ b/scripts/live-bottom/21xvidemode @@ -18,7 +18,7 @@ case "${1}" in ;; esac -# live-initramfs header +# live-boot header if [ -n "${NOXAUTOCONFIG}" ] then @@ -36,7 +36,7 @@ fi log_begin_msg "Configuring X video modes" -# live-initramfs script +# live-boot script . /live.vars @@ -47,29 +47,9 @@ then exit 0 fi -if [ $(cat /root/etc/debian_version | sed 's|\..*$||') -ge 4 ] +if [ -x "$(which xrandr 2>/dev/null)" ] then - # lenny or newer - if [ -x "$(which xrandr 2>/dev/null)" ] - then - echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode - fi -else - # etch - 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} -set xserver-xorg/config/display/modes ${XVIDEOMODE} -EOF - - chroot /root dexconf - - umount /root/sys - umount /root/proc - umount /root/dev + echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode fi log_end_msg