3 commits - config/livecd-fedora-base-desktop.ks config/livecd-fedora-desktop.ks

[Jeremy Katz]

config/livecd-fedora-base-desktop.ks |    4 ----
 config/livecd-fedora-desktop.ks      |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 936f5625a18cd75e7488f53249ddb405f883bfb2
Author: Jeremy Katz 
Date:   Wed Jan 30 13:39:55 2008 -0500

Use scim-chinese-pinyin instead of scim-pinyin (Jens Petersen)

diff --git a/config/livecd-fedora-desktop.ks b/config/livecd-fedora-desktop.ks
index 2738126..444d655 100644
--- a/config/livecd-fedora-desktop.ks
+++ b/config/livecd-fedora-desktop.ks
@@ -125,7 +125,7 @@ gnome-blog
 # more fun with space saving 
 -scim-lang-chinese
 scim-chewing
-scim-pinyin
+scim-chinese-pinyin

# save some space
 -gnome-user-docs

commit 9b7f69596b7cfbbe8beefd0e0c808ceebba9c720
Author: Jeremy Katz 
Date:   Wed Jan 30 13:37:47 2008 -0500

vmmouse is fixed also

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 7382059..4fe7299 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -126,9 +126,6 @@ fi

# configure X, allowing user to override xdriver
 exists system-config-display --noui --reconfig --set-depth=24 $xdriver
-# work around broken vmmouse driver
-grep -v CorePointer /etc/X11/xorg.conf > /etc/X11/xorg.conf.x
-mv -f /etc/X11/xorg.conf.x /etc/X11/xorg.conf

# add fedora user with no passwd
 useradd -c "Fedora Live" fedora

commit 3229b3907e829e06380579f6ce08bda2b688b7e5
Author: Jens Petersen 
Date:   Wed Jan 23 15:43:24 2008 +1000

xorg-x11-drv-cirrus is fixed

Just noticed cirrus is worked around in livecd-tools.git.
    You may know already but airlied fixed the cirrus driver this week.
    So here a little patch to bring it back.

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 46dd0e3..7382059 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -126,10 +126,9 @@ fi

# configure X, allowing user to override xdriver
 exists system-config-display --noui --reconfig --set-depth=24 $xdriver
-# work around broken vmmouse and cirrus drivers
+# work around broken vmmouse driver
 grep -v CorePointer /etc/X11/xorg.conf > /etc/X11/xorg.conf.x
 mv -f /etc/X11/xorg.conf.x /etc/X11/xorg.conf
-sed -i 's/cirrus/vesa/g' /etc/X11/xorg.conf

# add fedora user with no passwd
 useradd -c "Fedora Live" fedora