fedora-release/compose f8-fedora.ks, 1.1.4.1, 1.1.4.2 livecd-fedora-base-desktop.ks, 1.1.4.1, 1.1.4.2 livecd-fedora-desktop.ks, 1.1.4.1, 1.1.4.2 livecd-fedora-kde.ks, 1.1.4.1, 1.1.4.2

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643/compose

Modified Files:
      Tag: F-8
	f8-fedora.ks livecd-fedora-base-desktop.ks 
	livecd-fedora-desktop.ks livecd-fedora-kde.ks 
Log Message:
update the compose configs


Index: f8-fedora.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/f8-fedora.ks,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- f8-fedora.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
+++ f8-fedora.ks	30 Oct 2007 02:18:32 -0000	1.1.4.2
@@ -28,6 +28,7 @@
 esc
 # apps
 @authoring-and-publishing
+ at eclipse
 @editors
 emacs
 @games
@@ -43,6 +44,7 @@
 @development-libs
 @development-tools
 @gnome-software-development
+ at java-development
 @kde-software-development
 @web-development
 @x-software-development


Index: livecd-fedora-base-desktop.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-base-desktop.ks,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- livecd-fedora-base-desktop.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
+++ livecd-fedora-base-desktop.ks	30 Oct 2007 02:18:32 -0000	1.1.4.2
@@ -41,6 +41,12 @@
 # lose the compat stuff
 -compat*
 
+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+-ql2400-firmware
+
 # scanning takes quite a bit of space :/
 -xsane
 -xsane-gimp
@@ -86,6 +92,27 @@
    mount -o ro /dev/live /mnt/live
 fi
 
+# read some variables out of /proc/cmdline
+for o in \`cat /proc/cmdline\` ; do
+    case \$o in
+    ks=*)
+        ks="\${o#ks=}"
+        ;;
+    xdriver=*)
+        xdriver="--set-driver=\${o#xdriver=}"
+        ;;
+    esac
+done
+
+
+# if liveinst or textinst is given, start anaconda
+if strstr "\`cat /proc/cmdline\`" liveinst ; then
+   /usr/sbin/liveinst \$ks
+fi
+if strstr "\`cat /proc/cmdline\`" textinst ; then
+   /usr/sbin/liveinst --text \$ks
+fi
+
 # enable swaps unless requested otherwise
 swaps=\`blkid -t TYPE=swap -o device\`
 if ! strstr "\`cat /proc/cmdline\`" noswap -a [ -n "\$swaps" ] ; then
@@ -95,14 +122,6 @@
 fi
 
 # configure X, allowing user to override xdriver
-for o in \`cat /proc/cmdline\` ; do
-    case \$o in
-    xdriver=*)
-        xdriver="--set-driver=\${o#xdriver=}"
-        ;;
-    esac
-done
-
 exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
 
 # add fedora user with no passwd
@@ -140,6 +159,8 @@
 
 # save a little bit of space at least...
 rm -f /boot/initrd*
+# make sure there aren't core files lying around
+rm -f /core*
 
 %end
 
@@ -147,4 +168,9 @@
 %post --nochroot
 cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
 cp $INSTALL_ROOT/usr/share/doc/HTML/readme-live-image/en_US/readme-live-image-en_US.txt $LIVE_ROOT/README
+
+# only works on x86, x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+fi
 %end


Index: livecd-fedora-desktop.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-desktop.ks,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- livecd-fedora-desktop.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
+++ livecd-fedora-desktop.ks	30 Oct 2007 02:18:32 -0000	1.1.4.2
@@ -123,6 +123,7 @@
 -gimp-help
 -evolution-help
 -autofs
+-nss_db
 -vino
 
 %end


Index: livecd-fedora-kde.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-kde.ks,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- livecd-fedora-kde.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
+++ livecd-fedora-kde.ks	30 Oct 2007 02:18:32 -0000	1.1.4.2
@@ -12,6 +12,7 @@
 filelight
 krusader
 
+
 # if it is enough space include koffice-krita (~40 megs)
 koffice-krita
 
@@ -26,11 +27,7 @@
 rhgb
 man-pages
 smolt-firstboot
-
-# workaround the fact that knetworkmanager doesn't work with NM 0.7
-#knetworkmanager
-NetworkManager-gnome
--knetworkmanager
+knetworkmanager
 
 #some changes that we don't want...
 -specspo
@@ -98,26 +95,4 @@
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 EOF
 
-# adding some autostarted applications
-#cp /usr/share/applications/fedora-knetworkmanager.desktop /usr/share/autostart/
-sed -i 's/OnlyShowIn=GNOME;XFCE;/OnlyShowIn=GNOME;XFCE;KDE;/' /etc/xdg/autostart/nm-applet.desktop
-
-# and set up gnome-keyring to startup/shutdown in kde
-mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
-cat > /etc/skel/.kde/env/start-custom.sh << EOF
-#!/bin/sh
-eval \`gnome-keyring-daemon\`
-export GNOME_KEYRING_PID
-export GNOME_KEYRING_SOCKET
-EOF
-chmod 755 /etc/skel/.kde/env/start-custom.sh
-
-cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
-#/bin/sh
-if [-n "$GNOME_KEYRING_PID"];then
-kill $GNOME_KEYRING_PID
-fi
-EOF
-chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh
-
 %end