commit b500cb3bb951565ae27b461f7664fcaf86aa91b6 Author: kevin kevin@tummy.com Date: Thu Aug 12 09:43:00 2010 -0600

Fix xdriver= passing. Patch from Adam Williamson awilliam@redhat.com

fedora-live-base.ks | 9 +++++++-- fedora-live-mini.ks | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) --- diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 3bde1cc..ea24f2d 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -275,7 +275,7 @@ for o in `cat /proc/cmdline` ; do ks="--kickstart=${o#ks=}" ;; xdriver=*) - xdriver="--set-driver=${o#xdriver=}" + xdriver="${o#xdriver=}" ;; esac done @@ -348,7 +348,12 @@ fi

# configure X, allowing user to override xdriver if [ -n "$xdriver" ]; then - exists system-config-display --noui --reconfig --set-depth=24 $xdriver + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE +Section "Device" + Identifier "Videocard0" + Driver "$xdriver" +EndSection +FOE fi

EOF diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks index 7aa9652..4af3843 100644 --- a/fedora-live-mini.ks +++ b/fedora-live-mini.ks @@ -342,7 +342,7 @@ for o in `cat /proc/cmdline` ; do ks="${o#ks=}" ;; xdriver=*) - xdriver="--set-driver=${o#xdriver=}" + xdriver="${o#xdriver=}" ;; esac done @@ -359,7 +359,12 @@ fi

# configure X, allowing user to override xdriver if [ -n "$xdriver" ]; then - exists system-config-display --noui --reconfig --set-depth=24 $xdriver + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE +Section "Device" + Identifier "Videocard0" + Driver "$xdriver" +EndSection +FOE fi

EOF