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

Jesse Keating (jkeating) fedora-extras-commits at redhat.com
Fri Oct 19 20:28:45 UTC 2007


Author: jkeating

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

Modified Files:
      Tag: F-8
	f8-fedora.ks livecd-fedora-base-desktop.ks 
	livecd-fedora-desktop.ks livecd-fedora-kde.ks 
Log Message:
Prepare the Fedora 8 release build.



Index: f8-fedora.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/f8-fedora.ks,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- f8-fedora.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ f8-fedora.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
@@ -25,6 +25,7 @@
 tracker
 gnash
 liferea
+esc
 # apps
 @authoring-and-publishing
 @editors
@@ -32,6 +33,7 @@
 @games
 @graphical-internet
 @graphics
+ at java
 @office
 @sound-and-video
 @text-internet
@@ -64,10 +66,15 @@
 jfsutils
 # Languages
 @afrikaans-support
+ at albanian-support
 @arabic-support
+ at armenian-support
 @assamese-support
 @basque-support
+ at belarusian-support
 @bengali-support
+ at bhutanese-support
+ at bosnian-support
 @brazilian-support
 @breton-support
 @british-support
@@ -79,11 +86,14 @@
 @danish-support
 @dutch-support
 @estonian-support
+ at ethiopic-support
 @faeroese-support
+ at filipino-support
 @finnish-support
 @french-support
 @gaelic-support
 @galician-support
+ at georgian-support
 @german-support
 @greek-support
 @gujarati-support
@@ -92,41 +102,56 @@
 @hungarian-support
 @icelandic-support
 @indonesian-support
+ at inuktitut-support
 @irish-support
 @italian-support
 @japanese-support
 @kannada-support
+ at khmer-support
 @korean-support
+ at lao-support
+ at latvian-support
 @lithuanian-support
+ at low-saxon-support
 @malay-support
 @malayalam-support
+ at maori-support
 @marathi-support
+ at mongolian-support
+ at nepali-support
 @northern-sotho-support
 @norwegian-support
 @oriya-support
+ at persian-support
 @polish-support
 @portuguese-support
 @punjabi-support
 @romanian-support
 @russian-support
+ at samoan-support
 @serbian-support
 @sinhala-support
 @slovak-support
 @slovenian-support
+ at somali-support
 @southern-ndebele-support
 @southern-sotho-support
 @spanish-support
 @swati-support
 @swedish-support
+ at tagalog-support
 @tamil-support
 @telugu-support
 @thai-support
+ at tibetan-support
+ at tonga-support
 @tsonga-support
 @tswana-support
 @turkish-support
 @ukrainian-support
 @urdu-support
 @venda-support
+ at vietnamese-support
 @welsh-support
 @xhosa-support
 @zulu-support


Index: livecd-fedora-base-desktop.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-base-desktop.ks,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- livecd-fedora-base-desktop.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ livecd-fedora-base-desktop.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
@@ -6,7 +6,7 @@
 firewall --disabled
 xconfig --startxonboot
 part / --size 4096
-services --enabled=NetworkManager,dhcdbd --disabled=network,sshd
+services --enabled=NetworkManager --disabled=network,sshd
 
 repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
@@ -26,6 +26,7 @@
 -esc
 -samba-client
 -a2ps
+-mpage
 -redhat-lsb
 -sox
 -hplip
@@ -104,9 +105,6 @@
 
 exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
 
-# unmute sound card
-exists alsaunmute 0 2> /dev/null
-
 # add fedora user with no passwd
 useradd -c "Fedora Live" fedora
 passwd -d fedora > /dev/null
@@ -115,20 +113,27 @@
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
 # don't start yum-updatesd for livecd boots
-chkconfig --level 345 yum-updatesd off
+chkconfig --level 345 yum-updatesd off 2>/dev/null
 
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
-chkconfig --level 345 crond off
-chkconfig --level 345 atd off
-chkconfig --level 345 anacron off
-chkconfig --level 345 readahead_early off
-chkconfig --level 345 readahead_later off
+chkconfig --level 345 crond off 2>/dev/null
+chkconfig --level 345 atd off 2>/dev/null
+chkconfig --level 345 anacron off 2>/dev/null
+chkconfig --level 345 readahead_early off 2>/dev/null
+chkconfig --level 345 readahead_later off 2>/dev/null
 
 # Stopgap fix for RH #217966; should be fixed in HAL instead
 touch /media/.hal-mtab
+
+# workaround clock syncing on shutdown that we don't want (#297421)
+sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt
 EOF
 
+# workaround avahi segfault (#279301)
+touch /etc/resolv.conf
+/sbin/restorecon /etc/resolv.conf
+
 chmod 755 /etc/rc.d/init.d/fedora-live
 /sbin/restorecon /etc/rc.d/init.d/fedora-live
 /sbin/chkconfig --add fedora-live
@@ -141,4 +146,5 @@
 
 %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
 %end


Index: livecd-fedora-desktop.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-desktop.ks,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- livecd-fedora-desktop.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ livecd-fedora-desktop.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
@@ -7,6 +7,8 @@
 @sound-and-video
 @gnome-desktop
 nss-mdns
+NetworkManager-vpnc
+NetworkManager-openvpn
 # we don't include @office so that we don't get OOo.  but some nice bits
 abiword
 gnumeric
@@ -105,25 +107,27 @@
 
 # dictionaries are big
 -aspell-*
--m17n-db-*
 -man-pages-*
 -scim-tables-*
--scim-lang-*
 -wqy-bitmap-fonts
+-dejavu-fonts-experimental
+-dejavu-fonts
+
+# more fun with space saving 
+-scim-lang-chinese
+scim-chewing
+scim-pinyin
 
 # save some space
 -gnome-user-docs
 -gimp-help
 -evolution-help
 -autofs
+-vino
 
 %end
 
 %post
-# workaround avahi segfault (#279301)
-touch /etc/resolv.conf
-/sbin/restorecon /etc/resolv.conf
-
 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


Index: livecd-fedora-kde.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-kde.ks,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- livecd-fedora-kde.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ livecd-fedora-kde.ks	19 Oct 2007 20:28:43 -0000	1.1.4.1
@@ -3,7 +3,6 @@
 %packages
 @kde-desktop
 kdegames
-beryl-kde
 k3b
 koffice-kword
 koffice-kspread
@@ -13,9 +12,8 @@
 filelight
 krusader
 
-# if it is enough space include koffice-krita (~40 megs) and ktorrent (~3 megs)
+# if it is enough space include koffice-krita (~40 megs)
 koffice-krita
-ktorrent
 
 # some other extra packages
 gnupg
@@ -24,13 +22,16 @@
 nss-mdns
 
 # ignore comps.xml and make sure these packages are included
-knetworkmanager
 kpowersave
-redhat-artwork-kde
 rhgb
 man-pages
 smolt-firstboot
 
+# workaround the fact that knetworkmanager doesn't work with NM 0.7
+#knetworkmanager
+NetworkManager-gnome
+-knetworkmanager
+
 #some changes that we don't want...
 -specspo
 -scribus
@@ -62,11 +63,6 @@
 %end
 
 %post
-# workaround avahi segfault (#279301)
-touch /etc/resolv.conf
-/sbin/restorecon /etc/resolv.conf
-
-
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 DESKTOP="KDE"
@@ -98,11 +94,30 @@
 # disable screensaver
 sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
 
-# adding some autostarted applications
-cp /usr/share/applications/fedora-knetworkmanager.desktop /usr/share/autostart/
-
 # workaround to put liveinst on desktop and in menu
 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




More information about the fedora-extras-commits mailing list