fedora-release/compose rawhide-fedora.ks, NONE, 1.1 README, 1.1, 1.2 livecd-fedora-base-desktop.ks, 1.1, 1.2 livecd-fedora-desktop.ks, 1.1, 1.2 livecd-fedora-kde.ks, 1.1, 1.2 f8-fedora.ks, 1.1, NONE

Jesse Keating (jkeating) fedora-extras-commits at redhat.com
Thu Mar 13 16:05:58 UTC 2008


Author: jkeating

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

Modified Files:
	README livecd-fedora-base-desktop.ks livecd-fedora-desktop.ks 
	livecd-fedora-kde.ks 
Added Files:
	rawhide-fedora.ks 
Removed Files:
	f8-fedora.ks 
Log Message:
- Update for 9 Beta
- Update the compose files for 9 Beta
- Add system-release-cpe (from Mark Cox)
- Add terminal to issue (#436387)
- Rename development to rawhide where appropriate.




--- NEW FILE rawhide-fedora.ks ---
# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)

# Use a part of 'iso' to define how large you want your isos.
# Only used when composing to more than one iso.
# Default is 670 (megs), CD size.
#part iso --size=4998

# Add the repos you wish to use to compose here.  At least one of them needs group data.
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch

# Package manifest for the compose.  Uses repo group metadata to translate groups.
# (@base is added by default unless you add --nobase to %packages)
%packages
# core
tcsh
@base-x
kernel*
-kernel*-debug*
-kernel*-devel*
# Hardware stuff
@hardware-support
@dial-up
# Desktop Packages
@gnome-desktop
@kde-desktop
echo-icon-theme
tracker
gnash
liferea
esc
thunderbird
# apps
@authoring-and-publishing
@eclipse
@editors
joe
emacs
@games
@graphical-internet
@graphics
@java
@office
@sound-and-video
k3b
@text-internet
@system-tools
wireshark-gnome
# Devel packages
@development-libs
@development-tools
@gnome-software-development
@java-development
@kde-software-development
@web-development
@x-software-development
# Server packages
@dns-server
@ftp-server
@mail-server
@mysql
@network-server
@news-server
@printing
@server-cfg
@smb-server
@sql-server
@web-server --optional
# Virt group
@virtualization --optional
# filesystem stuff
reiserfs-utils
xfsprogs
jfsutils
# Languages
@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
@greek-support
@gujarati-support
@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
@low-saxon-support
@malay-support
@malayalam-support
@maori-support
@marathi-support
@mongolian-support
@nepali-support
@northern-sotho-support
@norwegian-support
@oriya-support
@persian-support
@polish-support
@portuguese-support
@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
# Compose Needs
anaconda-runtime
cracklib-python
iscsi-initiator-utils
memtest86+
vnc-server
%end


Index: README
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	28 Sep 2007 14:09:00 -0000	1.1
+++ README	13 Mar 2008 16:05:58 -0000	1.2
@@ -1,6 +1,6 @@
 These are the reference config files used to create Fedora releases.
 
-f8-fedora.ks - The traditional DVD release, pick and choose packages.
+rawhide-fedora.ks - The traditional DVD release, pick and choose packages.
 
 livecd-fedora-base-desktop.ks - The base Live desktop config
 


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.2
diff -u -r1.1 -r1.2
--- livecd-fedora-base-desktop.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ livecd-fedora-base-desktop.ks	13 Mar 2008 16:05:58 -0000	1.2
@@ -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
 
@@ -14,6 +14,7 @@
 @base-x
 @base
 @core
+ at fonts
 @admin-tools
 @dial-up
 @hardware-support
@@ -26,6 +27,7 @@
 -esc
 -samba-client
 -a2ps
+-mpage
 -redhat-lsb
 -sox
 -hplip
@@ -37,17 +39,22 @@
 -pinfo
 -vorbis-tools
 -wget
+# dasher is just too big
+-dasher
 # 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
 -sane-backends
 
-# lots of people want to have this
-gparted
-
 # livecd bits to set up the livecd and be able to install
 anaconda
 isomd5sum
@@ -85,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
@@ -94,19 +122,8 @@
 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
 
-# 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,30 +132,46 @@
 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
 
 # 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
 
 
 %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
+  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+  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
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- livecd-fedora-desktop.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ livecd-fedora-desktop.ks	13 Mar 2008 16:05:58 -0000	1.2
@@ -7,41 +7,29 @@
 @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
-evince
-gnome-blog
 #planner
 #inkscape
 
- at afrikaans-support
 @albanian-support
 @arabic-support
- at armenian-support
- at assamese-support
 @basque-support
- at belarusian-support
 @bengali-support
- at bhutanese-support
- at bosnian-support
 @brazilian-support
- at breton-support
 @british-support
 @bulgarian-support
 @catalan-support
 @chinese-support
- at croatian-support
 @czech-support
 @danish-support
 @dutch-support
 @estonian-support
- at ethiopic-support
- at faeroese-support
- at filipino-support
 @finnish-support
 @french-support
- at gaelic-support
 @galician-support
 @georgian-support
 @german-support
@@ -50,23 +38,15 @@
 @hebrew-support
 @hindi-support
 @hungarian-support
- at icelandic-support
 @indonesian-support
- at inuktitut-support
- at irish-support
 @italian-support
 @japanese-support
- at kannada-support
 @khmer-support
 @korean-support
- at lao-support
 @latvian-support
 @lithuanian-support
- at malay-support
 @malayalam-support
- at maori-support
 @marathi-support
- at northern-sotho-support
 @norwegian-support
 @oriya-support
 @persian-support
@@ -75,60 +55,106 @@
 @punjabi-support
 @romanian-support
 @russian-support
- at samoan-support
 @serbian-support
- at sinhala-support
 @slovak-support
 @slovenian-support
- at somali-support
- at southern-ndebele-support
- at southern-sotho-support
 @spanish-support
- at swati-support
 @swedish-support
- at tagalog-support
 @tamil-support
 @telugu-support
 @thai-support
- at tibetan-support
- at tonga-support
- at tsonga-support
- at tswana-support
 @turkish-support
 @ukrainian-support
- at urdu-support
- at venda-support
 @vietnamese-support
 @welsh-support
- at xhosa-support
- at 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
+#@assamese-support
+#@belarusian-support
+#@bhutanese-support
+#@bosnian-support
+#@breton-support
+#@croatian-support
+#@ethiopic-support
+#@faeroese-support
+#@filipino-support
+#@gaelic-support
+#@icelandic-support
+#@inuktitut-support
+#@irish-support
+#@kannada-support
+#@lao-support
+#@malay-support
+#@maori-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
+#@xhosa-support
+#@zulu-support
+
+# These fonts are only used in the commented-out locales above
+-lklug-fonts
+-lohit-fonts-kannada
+-abyssinica-fonts
+-jomolhari-fonts
+
 
 # dictionaries are big
 -aspell-*
--m17n-db-*
+-hunspell-*
 -man-pages-*
 -scim-tables-*
--scim-lang-*
 -wqy-bitmap-fonts
+-dejavu-fonts-experimental
+
+# more fun with space saving 
+-scim-lang-chinese
+-scim-python-chinese
+scim-chewing
+scim-pinyin
 
 # save some space
 -gnome-user-docs
 -gimp-help
 -evolution-help
 -autofs
-
+-nss_db
+-vino
+-dasher
+-evince-dvi
+-evince-djvu
+# temporary - drags in many deps
+-ekiga
+-tomboy
+-f-spot
 %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
 # 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
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+TimedLoginEnable=true
+TimedLogin=fedora
+TimedLoginDelay=60
+FOE
 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


Index: livecd-fedora-kde.ks
===================================================================
RCS file: /cvs/fedora/fedora-release/compose/livecd-fedora-kde.ks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- livecd-fedora-kde.ks	28 Sep 2007 14:09:00 -0000	1.1
+++ livecd-fedora-kde.ks	13 Mar 2008 16:05:58 -0000	1.2
@@ -2,46 +2,45 @@
 
 %packages
 @kde-desktop
-kdegames
-beryl-kde
-k3b
+
+# include nm-applet directly 
+-knetworkmanager
+NetworkManager-gnome
+
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+# digikam (~11 megs), ktorrent (~3 megs), amarok (~14 megs),
+# kdegames (~23 megs)
+-amarok
+-digikam
+-kdeedu
+-scribus
+#-ktorrent
+#-kdegames
+
+# KDE 3
 koffice-kword
 koffice-kspread
 koffice-kpresenter
 koffice-filters
-twinkle
+k3b
 filelight
-krusader
+# twinkle (~10 megs)
+twinkle
 
-# if it is enough space include koffice-krita (~40 megs) and ktorrent (~3 megs)
-koffice-krita
-ktorrent
-
-# some other extra packages
-gnupg
-synaptics
-hal-cups-utils
-nss-mdns
-
-# ignore comps.xml and make sure these packages are included
-knetworkmanager
-kpowersave
-redhat-artwork-kde
-rhgb
-man-pages
-smolt-firstboot
+# some extras
+fuse
 
-#some changes that we don't want...
--specspo
--scribus
--kdeaddons
--kdemultimedia-extras
--kdeartwork-extras
--kmymoney2
--basket
--speedcrunch
--autofs
+# additional fonts
+ at fonts
+fonts-ISO8859-2 
+#cjkunifonts-ukai 
+madan-fonts 
+fonts-KOI8-R 
+fonts-KOI8-R-100dpi 
+tibetan-machine-uni-fonts
 
+# FIXME/TODO: recheck the removals here
 # try to remove some packages from livecd-fedora-base-desktop.ks
 -scim*
 -gdm
@@ -55,22 +54,17 @@
 -python-devel
 -libchewing
 
-# workaround for the moment (requirements of hplip)
-python-imaging
-python-reportlab
+# save some space
+-autofs
 
 %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"
-DISPLAYMANAGER="KDE"
+DISPLAYMANAGER="KDM"
 EOF
 
 # add initscript
@@ -95,14 +89,15 @@
 sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
 sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
 
-# 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/
+# add liveinst.desktop to favorites menu
+mkdir -p /home/fedora/.kde/share/config/
+cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
+[Favorites]
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/liveinst.desktop
+MENU_EOF
+chown -R fedora:fedora /home/fedora/.kde/
 
-# workaround to put liveinst on desktop and in menu
-sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-EOF
+# workaround to start nm-applet automatically
+cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/
 
 %end


--- f8-fedora.ks DELETED ---




More information about the fedora-extras-commits mailing list