Makefile | 2
config/livecd-fedora-8-base-desktop.ks | 177 +++++++++++++++++++++++
config/livecd-fedora-8-desktop.ks | 145 ++++++++++++++++++
config/livecd-fedora-8-developer.ks | 115 ++++++++++++++
config/livecd-fedora-8-electronic-lab.ks | 238 +++++++++++++++++++++++++++++++
config/livecd-fedora-8-games.ks | 155 ++++++++++++++++++++
config/livecd-fedora-8-kde.ks | 98 ++++++++++++
config/livecd-fedora-base-desktop.ks | 36 +++-
config/livecd-fedora-desktop.ks | 1
config/livecd-fedora-developer.ks | 1
creator/livecd-creator | 2
livecd-tools.spec | 10 +
12 files changed, 968 insertions(+), 12 deletions(-)
New commits:
commit 38a4477116c998f3b99779e53ce1ffe9a0849a5b
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Oct 29 13:45:22 2007 -0400
bump version
diff --git a/Makefile b/Makefile
index 3bbb3ef..a86371d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 012
+VERSION = 013
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 4c447a7..0950d58 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -2,7 +2,7 @@
Summary: Tools for building live CD's
Name: livecd-tools
-Version: 012
+Version: 013
Release: 1%{?dist}
License: GPL
Group: System Environment/Base
@@ -55,6 +55,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/livecd-tools/*
%changelog
+* Mon Oct 29 2007 Jeremy Katz <katzj(a)redhat.com> - 013-1
+- Lots of config updates
+- Support 'device foo' to say what modules go in the initramfs
+- Support multiple kernels being installed
+- Allow blacklisting kernel modules on boot with blacklist=foo
+- Improve bootloader configs
+- Split configs off for f8
+
* Tue Sep 25 2007 Jeremy Katz <katzj(a)redhat.com> - 012-1
- Allow %%post --nochroot to work for putting files in the root of the iso
- Set environment variables for when %%post is run
commit 833dd54b455020e59055a94780958b6643b9d796
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Oct 29 13:44:53 2007 -0400
add f8 configs
diff --git a/config/livecd-fedora-8-base-desktop.ks b/config/livecd-fedora-8-base-desktop.ks
new file mode 100644
index 0000000..199093f
--- /dev/null
+++ b/config/livecd-fedora-8-base-desktop.ks
@@ -0,0 +1,177 @@
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --enablemd5
+selinux --enforcing
+firewall --disabled
+xconfig --startxonboot
+part / --size 4096
+services --enabled=NetworkManager --disabled=network,sshd
+
+repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f8&arch=$basearch
+
+%packages
+@base-x
+@base
+@core
+@admin-tools
+@dial-up
+@hardware-support
+@printing
+kernel
+memtest86+
+
+# save some space
+-specspo
+-esc
+-samba-client
+-a2ps
+-mpage
+-redhat-lsb
+-sox
+-hplip
+-hpijs
+# smartcards won't really work on the livecd.
+-coolkey
+-ccid
+# duplicate functionality
+-pinfo
+-vorbis-tools
+-wget
+# 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
+
+# make sure debuginfo doesn't end up on the live image
+-*debuginfo
+%end
+
+%post
+# FIXME: it'd be better to get this installed from a package
+cat > /etc/rc.d/init.d/fedora-live << EOF
+#!/bin/bash
+#
+# live: Init script for live image
+#
+# chkconfig: 345 00 99
+# description: Init script for live image.
+
+. /etc/init.d/functions
+
+if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-configured ] ; then
+ exit 0
+fi
+
+exists() {
+ which \$1 >/dev/null 2>&1 || return
+ \$*
+}
+
+touch /.liveimg-configured
+
+# mount live image
+if [ -b /dev/live ]; then
+ mkdir -p /mnt/live
+ 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
+ for s in \$swaps ; do
+ action "Enabling swap partition \$s" swapon \$s
+ done
+fi
+
+# configure X, allowing user to override xdriver
+exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
+
+# add fedora user with no passwd
+useradd -c "Fedora Live" fedora
+passwd -d fedora > /dev/null
+
+# turn off firstboot for livecd boots
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# don't start yum-updatesd for livecd boots
+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 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
+ cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+fi
+%end
diff --git a/config/livecd-fedora-8-desktop.ks b/config/livecd-fedora-8-desktop.ks
new file mode 100644
index 0000000..2dad982
--- /dev/null
+++ b/config/livecd-fedora-8-desktop.ks
@@ -0,0 +1,145 @@
+%include livecd-fedora-8-base-desktop.ks
+
+%packages
+@games
+@graphical-internet
+@graphics
+@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
+
+@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
+@malay-support
+@malayalam-support
+@maori-support
+@marathi-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
+
+# dictionaries are big
+-aspell-*
+-man-pages-*
+-scim-tables-*
+-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
+-nss_db
+-vino
+
+%end
+
+%post
+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
+
+EOF
+
+%end
diff --git a/config/livecd-fedora-8-developer.ks b/config/livecd-fedora-8-developer.ks
new file mode 100644
index 0000000..208f701
--- /dev/null
+++ b/config/livecd-fedora-8-developer.ks
@@ -0,0 +1,115 @@
+%include livecd-fedora-8-desktop.ks
+
+part / --size 6000
+
+%packages
+# Libraries
+@development-libs
+@gnome-software-development
+@java-development
+
+# SCM tools
+bazaar
+bzr
+cogito
+cvs2cl
+cvsutils
+git
+mercurial
+monotone
+quilt
+
+# IDEs
+@eclipse
+anjuta
+anjuta-docs
+codeblocks
+
+# General developer tools
+@authoring-and-publishing
+@development-tools
+@editors
+@system-tools
+@virtualization
+ElectricFence
+alleyoop
+crash
+dejagnu
+dogtail
+elfutils-devel
+emacs
+emacs-el
+expect
+frysk-gnome
+gconf-editor
+gettext-devel
+gnuplot
+hexedit
+inkscape
+intltool
+lynx
+maven2
+mutt
+scons
+sharutils
+socat
+sox
+sysprof
+tcp_wrappers-devel
+tcsh
+texi2html
+xchat
+
+# RPM/Fedora-specific tools
+@buildsys-build
+createrepo
+koji
+livecd-tools
+mock
+rpmdevtools
+rpmlint
+
+eclipse-demos
+
+# Should we?
+#@sql-server
+#@mysql
+#@ruby
+#@web-development
+#@x-software-development
+# I think this is going to be too big on x86_64
+#*-devel
+%end
+
+%post
+# Enable debuginfo repository (useful for frysk, gdb, etc.)
+awk '
+BEGIN {
+ debuginfo = 0
+}
+ /^\[.*\]/ {
+ if (/debuginfo/) {
+ debuginfo = 1
+ } else {
+ debuginfo = 0
+ }
+ print
+ next
+}
+ /enabled=0/ && debuginfo {
+ print "enabled=1"
+ next
+}
+{
+ print
+ next
+}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
+mv /etc/yum.repos.d/fedora.repo{.tmp,}
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+# Put link to demonstration videos on the desktop
+pushd /home/fedora/Desktop
+ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
+popd
+EOF
+%end
diff --git a/config/livecd-fedora-8-electronic-lab.ks b/config/livecd-fedora-8-electronic-lab.ks
new file mode 100644
index 0000000..52fa3e0
--- /dev/null
+++ b/config/livecd-fedora-8-electronic-lab.ks
@@ -0,0 +1,238 @@
+# Description : Live image for Fedora Electronic Lab
+# last updated: 10 October 2007
+
+%include livecd-fedora-8-base-desktop.ks
+
+%packages
+# KDE basic packages
+kdebase
+kde-filesystem
+kdelibs
+kdenetwork
+kdegraphics
+kdeutils
+knetworkmanager
+kde-settings
+kmenu-gnome
+kdesvn
+yakuake
+# include default fedora wallpaper
+desktop-backgrounds-basic
+wget
+
+# some projects based on ghdl and gtkwave needs
+zlib-devel
+
+#project management
+vym
+koffice-kspread
+koffice-kword
+koffice-kplato
+koffice-filters
+
+# some other extra packages
+ntfsprogs
+ntfs-3g
+synaptics
+setroubleshoot
+smolt
+smolt-firstboot
+syslinux
+gnupg
+hal-cups-utils
+
+# we don't want these
+-dos2unix
+-firefox
+-authconfig-gtk
+-PolicyKit-gnome
+-gnome-doc-utils-stylesheets
+
+# ignore comps.xml and make sure these packages are included
+kpowersave
+rhgb
+
+
+#vlsi
+alliance-doc
+irsim
+gds2pov
+magic-doc
+toped
+xcircuit
+qucs
+netgen
+
+#Hardware Description Languages
+gtkwave
+iverilog
+drawtiming
+ghdl
+freehdl
+
+#spice
+ngspice
+gnucap
+#gspiceui
+#gwave
+
+#PCB and schematics
+geda-gschem
+geda-examples
+geda-gsymcheck
+geda-gattrib
+geda-utils
+geda-docs
+geda-gnetlist
+gerbv
+gresistor
+kicad
+pcb
+
+#Micro Programming
+piklab
+ktechlab
+pikloops
+sdcc
+
+# Serial Port Terminals
+gtkterm
+picocom
+minicom
+
+#embedded
+arm-gp2x-linux*
+avr-*
+avrdude
+dfu-programmer
+avarice
+uisp
+
+#computing
+octave
+octave-forge
+
+%end
+
+%post
+
+###### Fedora Electronic Lab ####################################################
+
+# Fedora Electronic Lab: Kwin buttons
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
+[Style]
+ButtonsOnLeft=MB
+ButtonsOnRight=FIAX
+CustomButtonPositions=true
+EOF
+
+
+# kill stupid klipper
+cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
+[General]
+AutoStart=false
+EOF
+
+# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
+cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
+[Digital]
+LCD_Style=false
+Show_Date=false
+Show_Seconds=true
+
+[General]
+Type=Digital
+EOF
+
+
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
+[Layout]
+DisplayNames=
+EnableXkbOptions=false
+IncludeGroups=
+LayoutList=us,de,fr,jp
+Model=pc104
+Options=
+ResetOldOptions=false
+ShowFlag=true
+ShowSingle=true
+StickySwitching=false
+StickySwitchingDepth=2
+SwitchMode=Global
+Use=true
+EOF
+
+# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
+# This is a feature for Fedora and not for KDE
+cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
+
+###### KDE #####################################################################
+
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
+# add initscript qnd # Fedora Electronic Lab: KDE keyboard layouts
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+ # use image also for kdm
+ mkdir -p /usr/share/apps/kdm/faces
+ cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make fedora user use KDE
+echo "startkde" > /home/fedora/.xsession
+chmod a+x /home/fedora/.xsession
+chown fedora:fedora /home/fedora/.xsession
+
+# set up autologin for user fedora
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+
+# set up user fedora as default user and preselected user
+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
+
+# workaround to put liveinst on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+EOF
+
+# 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
+
+###### Fedora Electronic Lab ####################################################
+
+# FEL doesn't need these and boots slowly
+/sbin/chkconfig --del anacron
+/sbin/chkconfig --del sendmail
+/sbin/chkconfig --del nfs
+/sbin/chkconfig --del nfslock
+/sbin/chkconfig --del rpcidmapd
+/sbin/chkconfig --del rpcbind
+
+%end
+
diff --git a/config/livecd-fedora-8-games.ks b/config/livecd-fedora-8-games.ks
new file mode 100644
index 0000000..014ce65
--- /dev/null
+++ b/config/livecd-fedora-8-games.ks
@@ -0,0 +1,155 @@
+%include /usr/share/livecd-tools/livecd-fedora-8-desktop.ks
+part / --size 8000
+
+# customize repo configuration for local builds
+# repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+
+
+%packages
+
+# games
+
+# traditional (big)
+
+bzflag
+openarena
+#croquet (pending)
+#vdrift
+nethack-vultures
+freedoom
+beneath-a-steel-sky-cd
+flight-of-the-amazon-queen-cd
+supertuxkart
+scorched3d
+neverball
+lincity-ng
+freeciv
+pinball
+asc
+asc-music
+vegastrike
+FlightGear
+nexuiz
+torcs
+tremulous
+frozen-bubble
+xpilot-ng
+crossfire-client
+wormux
+wesnoth
+gl-117
+supertux
+manaworld
+freedroidrpg
+maniadrive
+maniadrive-music
+abuse
+worminator
+armacycles-ad
+blobAndConquer
+boswars
+warzone2100
+widelands
+freecol
+astromenace
+egoboo
+
+# traditional (small)
+
+nethack
+openlierox
+clanbomber
+liquidwar
+rogue
+ularn
+bsd-games
+gnubg
+gnugo
+quarry
+bombardier
+ballz
+blobwars
+hedgewars
+machineball
+Ri-li
+stormbaancoureur
+quake3
+vavoom
+rott-shareware
+londonlaw
+nazghul-haxima
+scorchwentbonkers
+seahorse-adventures
+
+# arcade classics(ish) (big)
+
+raidem
+raidem-music
+duel3
+lmarbles
+trackballs
+trackballs-music
+auriferous
+
+# arcade classics(ish) (small)
+
+lacewing
+njam
+#(xgalaga renamed)
+xgalaxy
+ballbuster
+tecnoballz
+dd2
+KoboDeluxe
+Maelstrom
+methane
+zasx
+shippy
+seahorse-adventures
+
+# falling blocks games (small)
+
+fbg
+gemdropx
+crystal-stacker
+crack-attack
+
+# puzzles (big)
+enigma
+fillets-ng
+pingus
+
+# puzzles (small)
+
+magicor
+mirrormagic
+rocksndiamonds
+escape
+
+# card games
+
+poker2d
+
+# educational/simulation
+
+celestia
+stellarium
+tuxpaint
+tuxpaint-stamps
+tuxtype2
+gcompris
+childsplay
+bygfoot
+
+# kde based games
+ksirk
+taxipilot
+poker2d-kde
+
+# utilities
+
+dosbox
+games-menus
+wget
+
+%end
diff --git a/config/livecd-fedora-8-kde.ks b/config/livecd-fedora-8-kde.ks
new file mode 100644
index 0000000..d58d735
--- /dev/null
+++ b/config/livecd-fedora-8-kde.ks
@@ -0,0 +1,98 @@
+%include livecd-fedora-8-base-desktop.ks
+
+%packages
+@kde-desktop
+kdegames
+k3b
+koffice-kword
+koffice-kspread
+koffice-kpresenter
+koffice-filters
+twinkle
+filelight
+krusader
+
+
+# if it is enough space include koffice-krita (~40 megs)
+koffice-krita
+
+# some other extra packages
+gnupg
+synaptics
+hal-cups-utils
+nss-mdns
+
+# ignore comps.xml and make sure these packages are included
+kpowersave
+rhgb
+man-pages
+smolt-firstboot
+knetworkmanager
+
+#some changes that we don't want...
+-specspo
+-scribus
+-kdeaddons
+-kdemultimedia-extras
+-kdeartwork-extras
+-kmymoney2
+-basket
+-speedcrunch
+-autofs
+
+# try to remove some packages from livecd-fedora-base-desktop.ks
+-scim*
+-gdm
+-authconfig-gtk
+-m17n*
+-PolicyKit-gnome
+-gnome-doc-utils-stylesheets
+-anthy
+-kasumi
+-pygtkglext
+-python-devel
+-libchewing
+
+# workaround for the moment (requirements of hplip)
+python-imaging
+python-reportlab
+
+%end
+
+%post
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
+# add initscript
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+ # use image also for kdm
+ mkdir -p /usr/share/apps/kdm/faces
+ cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make fedora user use KDE
+echo "startkde" > /home/fedora/.xsession
+chmod a+x /home/fedora/.xsession
+chown fedora:fedora /home/fedora/.xsession
+
+# set up autologin for user fedora
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+
+# set up user fedora as default user and preselected user
+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
+
+# workaround to put liveinst on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+EOF
+
+%end
commit f5b1211c6fbaf607f7678aec0d594917e042d3ff
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Oct 29 13:36:04 2007 -0400
make sure we don't leave any core files lying around
diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 37ee979..3512538 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -159,6 +159,8 @@ chmod 755 /etc/rc.d/init.d/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
commit 1c3f1d375a067a1d15e1c1335d407cdc3497fe64
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Sun Oct 28 14:26:17 2007 -0400
remove yum-priorities so that behavior is consistent (#354691)
diff --git a/config/livecd-fedora-developer.ks b/config/livecd-fedora-developer.ks
index 9849283..02f984d 100644
--- a/config/livecd-fedora-developer.ks
+++ b/config/livecd-fedora-developer.ks
@@ -68,7 +68,6 @@ livecd-tools
mock
rpmdevtools
rpmlint
-yum-priorities
eclipse-demos
commit e7fd47cd8f9a614100a841070bb1938832561d24
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Oct 25 14:44:06 2007 -0400
fix the obvious thinko
diff --git a/creator/livecd-creator b/creator/livecd-creator
index 1160077..a89ef64 100755
--- a/creator/livecd-creator
+++ b/creator/livecd-creator
@@ -1581,7 +1581,7 @@ def main():
target.unmount()
- if not skip_minimize:
+ if not options.skip_minimize:
target.cleanupDeleted()
target.genMinInstDelta()
commit f74092ee0c79f064279e1b41066ef2ec3cf6b327
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Tue Oct 23 23:27:12 2007 -0400
allow kicking off the install from the kernel command line, including
kickstart. include livecd-iso-to-disk on the image
diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 6c66597..37ee979 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -92,6 +92,27 @@ if [ -b /dev/live ]; then
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
@@ -101,14 +122,6 @@ if ! strstr "\`cat /proc/cmdline\`" noswap -a [ -n "\$swaps" ] ; then
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
@@ -153,4 +166,9 @@ rm -f /boot/initrd*
%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
commit 75a70476fb85282553ef734e34d3c24e50d2aeb2
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Tue Oct 23 22:48:26 2007 -0400
remove nss_db to save some space
diff --git a/config/livecd-fedora-desktop.ks b/config/livecd-fedora-desktop.ks
index bbf6641..61d6d54 100644
--- a/config/livecd-fedora-desktop.ks
+++ b/config/livecd-fedora-desktop.ks
@@ -123,6 +123,7 @@ scim-pinyin
-gimp-help
-evolution-help
-autofs
+-nss_db
-vino
%end
