fedora-live-base.ks | 17 +++----
fedora-livecd-desktop-default.ks | 83 +++++++++++++++++++++++----------------
fedora-livecd-desktop.ks | 36 ++++++++++++----
3 files changed, 84 insertions(+), 52 deletions(-)
New commits:
commit 498e32146f0fd6737054e649b66df64689d5d585
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 11 10:52:45 2008 -0400
Don't set face image and use more robust way of setting gdm config from F9 cfg
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 4f7a55c..371ad17 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -63,12 +63,12 @@ cat >> /etc/rc.d/init.d/fedora-live << EOF
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t
bool /apps/gnome-screensaver/lock_enabled false >/dev/null
# set up timed auto-login for after 60 seconds
-sed -i -e
's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/'
/etc/gdm/custom.conf
-if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
- cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
- chown fedora:fedora /home/fedora/.face
- # TODO: would be nice to get e-d-s to pick this one up too... but how?
-fi
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+TimedLoginEnable=true
+TimedLogin=fedora
+TimedLoginDelay=60
+FOE
EOF
commit 58b5bff26e7c19c5ee78f929a45430c0c02c2564
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 11 10:52:18 2008 -0400
Make the cache for 'man -k' to be able to work by default (#455968)
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index e84aa7c..61b8bc7 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -292,6 +292,9 @@ chmod 755 /etc/rc.d/init.d/fedora-late-live
rm -f /var/lib/rpm/__db*
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+# go ahead and pre-make the man -k cache (#455968)
+/usr/sbin/makewhatis -w
+
# save a little bit of space at least...
rm -f /boot/initrd*
# make sure there aren't core files lying around
commit 50929c433e27997425608789064e5c3b9d28c464
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 11 10:51:55 2008 -0400
Use plymouth when asking for password to unlock encrypted persistent /home
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index d8a63f7..e84aa7c 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -138,7 +138,7 @@ mountPersistentHome() {
if [ "\$(/lib/udev/vol_id -t \$homedev)" = "crypto_LUKS" ]; then
echo
echo "Setting up encrypted /home device"
- cryptsetup luksOpen \$homedev EncHome <&1
+ plymouth ask-for-password --command="cryptsetup luksOpen \$homedev
EncHome"
homedev=/dev/mapper/EncHome
fi
commit 6984b85099baabe8d495a1ee335d990b996d914e
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 11 10:51:27 2008 -0400
Make language support in the all language case be the 50%+ mark used in F9
diff --git a/fedora-livecd-desktop-default.ks b/fedora-livecd-desktop-default.ks
index 998146c..e7a9193 100644
--- a/fedora-livecd-desktop-default.ks
+++ b/fedora-livecd-desktop-default.ks
@@ -10,33 +10,23 @@ keyboard us
timezone US/Eastern
%packages
-@afrikaans-support
@albanian-support
@arabic-support
-@armenian-support
@assamese-support
@basque-support
@belarusian-support
@bengali-support
-@bhutanese-support
-@bosnian-support
@brazilian-support
-@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
-@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
-@ethiopic-support
-@faeroese-support
-@filipino-support
@finnish-support
@french-support
-@gaelic-support
@galician-support
@georgian-support
@german-support
@@ -45,23 +35,17 @@ timezone US/Eastern
@hebrew-support
@hindi-support
@hungarian-support
-@icelandic-support
@indonesian-support
-@inuktitut-support
-@irish-support
@italian-support
@japanese-support
@kannada-support
-@khmer-support
@korean-support
-@lao-support
@latvian-support
@lithuanian-support
-@malay-support
+@macedonian-support
@malayalam-support
-@maori-support
@marathi-support
-@northern-sotho-support
+@nepali-support
@norwegian-support
@oriya-support
@persian-support
@@ -70,31 +54,64 @@ timezone US/Eastern
@punjabi-support
@romanian-support
@russian-support
-@samoan-support
@serbian-support
-@sinhala-support
@slovak-support
@slovenian-support
-@somali-support
-@southern-ndebele-support
-@southern-sotho-support
@spanish-support
-@swati-support
@swedish-support
-@tagalog-support
@tamil-support
@telugu-support
@thai-support
-@tibetan-support
-@tonga-support
-@tsonga-support
-@tswana-support
@turkish-support
@ukrainian-support
-@urdu-support
-@venda-support
@vietnamese-support
@welsh-support
-@xhosa-support
-@zulu-support
+
+# The following locales have less than 50% translation coverage for the core
+# GNOME stack, as found at
http://l10n.gnome.org/languages/
+
+#@afrikaans-support
+#@armenian-support
+#@bhutanese-support
+#@bosnian-support
+#@breton-support
+#@croatian-support
+#@esperanto-support
+#@ethiopic-support
+#@faeroese-support
+#@filipino-support
+#@gaelic-support
+#@icelandic-support
+#@inuktitut-support
+#@irish-support
+#@khmer-support
+#@lao-support
+#@low-saxon-support
+#@malay-support
+#@maori-support
+#@mongolian-support
+#@northern-sami-support
+#@northern-sotho-support
+#@samoan-support
+#@sinhala-support
+#@somali-support
+#@southern-ndebele-support
+#@southern-sotho-support
+#@swati-support
+#@tagalog-support
+#@tibetan-support
+#@tonga-support
+#@tsonga-support
+#@tswana-support
+#@urdu-support
+#@venda-support
+#@walloon-support
+#@xhosa-support
+#@zulu-support
+
+# These fonts are only used in the commented-out locales above
+-lklug-fonts
+-abyssinica-fonts
+-jomolhari-fonts
+
%end
commit 6621445de949abe8c762d2f162daebdc11aa6d30
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 11 10:50:41 2008 -0400
Bring default package sets in line with the images used for F9 and F10alpha
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index c15fed5..d8a63f7 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -33,15 +33,14 @@ repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
@base-x
@base
@core
+@fonts
@admin-tools
@dial-up
@hardware-support
@printing
kernel
memtest86+
-
-# for live initrd
-livecd-tools
+firstaidkit-plugin-all
# save some space
-specspo
@@ -74,9 +73,6 @@ livecd-tools
-xsane-gimp
-sane-backends
-# lots of people want to have this
-gparted
-
# livecd bits to set up the livecd and be able to install
anaconda
isomd5sum
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 062bedd..4f7a55c 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -12,21 +12,24 @@ NetworkManager-openvpn
# we don't include @office so that we don't get OOo. but some nice bits
abiword
gnumeric
-evince
-gnome-blog
#planner
#inkscape
+# avoid weird case where we pull in more festival stuff than we need
+festival
+festvox-slt-arctic-hts
+
# dictionaries are big
-aspell-*
+-hunspell-*
-man-pages-*
-scim-tables-*
-wqy-bitmap-fonts
-dejavu-fonts-experimental
--dejavu-fonts
# more fun with space saving
-scim-lang-chinese
+-scim-python*
scim-chewing
scim-pinyin
@@ -38,6 +41,21 @@ scim-pinyin
-nss_db
-vino
+-dasher
+-evince-dvi
+-evince-djvu
+# not needed for gnome
+-acpid
+# temporary - drags in many deps
+-ekiga
+-tomboy
+-f-spot
+
+# try to get down to cd sized for the alpha
+-gnumeric
+-isdn4k-utils
+# hack to deal with conditionals + multiarch blargh
+-scim-bridge-gtk.i386
%end
%post
commit b316cda63bcfe52bfd971b1bbbb8d2418c3ded00
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Aug 11 10:49:11 2008 -0400
Use $basearch rather than hardcoding i386
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 9e97c47..c15fed5 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -1,7 +1,5 @@
# fedora-live-base.ks
#
-# Version independent kickstart configuration for Fedora Live Media
-#
# Defines the basics for all kickstarts in the fedora-live branch
# Does not include package selection (other then mandatory)
# Does not include localization packages or configuration
@@ -25,7 +23,7 @@ services --enabled=NetworkManager --disabled=network,sshd
#repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
# To compose against rawhide, use the following "repo" (disabled by default)
-repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
+repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
# To compose against local trees, use:
#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/