diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-03-05 10:59:21 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:04 +0100 |
| commit | 286b9e73a78f2b545d09d512db05c4340b25ccb2 (patch) | |
| tree | aefabc0c967d0d07c7fce5066c61561d31a6cac3 /scripts | |
| parent | 275dd05ee92e5312fd7ae40e7ef60b3073ba4c65 (diff) | |
| download | live-boot-286b9e73a78f2b545d09d512db05c4340b25ccb2.tar.gz live-boot-286b9e73a78f2b545d09d512db05c4340b25ccb2.zip | |
Improving check in 21xdriver when we don't do anything.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/21xdriver | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver index 29ae78e..ef17bff 100755 --- a/scripts/live-bottom/21xdriver +++ b/scripts/live-bottom/21xdriver @@ -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 @@ -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 |