Skip to content

Commit

Permalink
Improving check in 21xdriver when we don't do anything.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-baumann committed Mar 5, 2009
1 parent aabdbd2 commit 05fcc34
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions scripts/live-bottom/21xdriver
Expand Up @@ -20,12 +20,7 @@ esac

# live-initramfs header

if [ -n "${NOXAUTOCONFIG}" ]
then
exit 0
fi

if [ ! -x /root/usr/bin/X ]
if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -n "${XDRIVER}" ]
then
exit 0
fi
Expand All @@ -38,22 +33,19 @@ log_begin_msg "Configuring X video driver"

. /live.vars

if [ -n "$XDRIVER" ]
then
mount -o bind /sys /root/sys
mount -o bind /proc /root/proc
mount -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/autodetect_video_card false
set xserver-xorg/config/device/driver ${XDRIVER}
EOF

chroot /root dexconf
chroot /root dexconf

umount /root/sys
umount /root/proc
umount /root/dev
fi
umount /root/sys
umount /root/proc
umount /root/dev

log_end_msg

0 comments on commit 05fcc34

Please sign in to comment.