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

[Jeremy Katz]

 config/livecd-fedora-base-desktop.ks |    5 ++++-
 config/livecd-fedora-desktop.ks      |    6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit f56568d9673dc8304e519aa4af29fe2a9dc72c36
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Thu Jul 31 13:32:51 2008 -0400

    Hacks for the alpha so that we fit on a CD.
    
    Once compat-db stops being used for rpm, these should pretty easily be
    able to return

diff --git a/config/livecd-fedora-desktop.ks b/config/livecd-fedora-desktop.ks
index f8e1f99..e45c092 100644
--- a/config/livecd-fedora-desktop.ks
+++ b/config/livecd-fedora-desktop.ks
@@ -153,6 +153,12 @@ scim-pinyin
 -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 7e6afde56b9c47c1ecbb1bbfc70cd7a37007cf4c
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Mon Jul 28 15:19:27 2008 -0400

    Use plymouth to ask for password as we're going to always be using plymouth

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index c450f79..f24c091 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -121,7 +121,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 ad6f21ab782297411cef31f8c1106ee55ff7a20d
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Tue Jul 22 17:01:07 2008 -0400

    Run makewhatis so that apropos works (#455968)

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 602e9f6..c450f79 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -275,6 +275,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