Rebase against latest livecd-tools configuration

2 files changed, 218 insertions, 160 deletions

diff --git a/fedora-security-livecd.ks b/fedora-security-livecd.ks
index 7930967..2f5eb00 100644
--- a/fedora-security-livecd.ks
+++ b/fedora-security-livecd.ks
@@ -1,120 +1,110 @@
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-auth --useshadow --enablemd5
-selinux --enforcing
-firewall --disabled
-repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=i386
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f7&arch=i386
-xconfig --startxonboot
-services --enabled=NetworkManager,dhcdbd --disabled=network,sshd
+%include livecd-fedora-base-desktop.ks
 
 %packages
-# basic desktop packages
 @graphical-internet
-#@graphics
-#@sound-and-video
 @gnome-desktop
-@base-x
-#@games
-@base
-@core
-@admin-tools
-@dial-up
-@hardware-support
-#@printing
-syslinux
-kernel
 
-scim*
--scim-devel
--scim-doc
--scim-qtimm
--scim-bridge-qt
--scim-skk
--scim-tomoe
--scim-tables-chinese
--scim-fcitx*
--scim-tables-additional
--scim-skk
-
-
-m17n-lib
-m17n-db
-#m17n-db-*
-
-fonts-*
+@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-*
 -m17n-db-*
 -man-pages-*
-# gimp help is huge
--gimp-help
-# lose the compat stuff
--compat*
+-scim-tables-*
 
-# space sucks
--ekiga
+# save some space
 -gnome-user-docs
--specspo
--esc
--samba-client
--a2ps
 -vino
--redhat-lsb
--sox
 -tomboy
+-gimp-help
 
-# smartcards won't really work on the livecd.  and we _need_ space
--coolkey
--ccid
-
-# duplicate functionality
--pinfo
--vorbis-tools
--wget
-
-
-# scanning takes quite a bit of space :/
--xsane
--xsane-gimp
-
-# while hplip requires pyqt, it has to go
--hplip
-
-# added games
-#monkey-bubble
-#ppracer
-
-# we don't include @office so that we don't get OOo.  but some nice bits
-#abiword
-#gnumeric
-#evince
-#gnome-blog
--planner
-
-# make sure debuginfo doesn't end up on the live image
--*debuginfo
-
-# lots of people want...
-#gparted
-ntfs-3g
-ntfsprogs
-
-# livecd bits to set up the livecd and be able to install
-anaconda
-anaconda-runtime
-
-# Other useful stuff
-#irssi
-screen
-#gtk-recordmydesktop
-#byzanz
-#istanbul
-tor
-
-# Security tools
+# security tools
 aide
 aircrack-ng
 airsnort
@@ -154,45 +144,12 @@ hunt
 firewalk
 foremost
 iptraf
+tor
+screen
+%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
-
-# configure X
-exists system-config-display --noui --reconfig --set-depth=24
-
-# 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
+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
@@ -203,26 +160,6 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
     # TODO: would be nice to get e-d-s to pick this one up too... but how?
 fi
 
-# 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
-
-# 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
-
-# Stopgap fix for RH #217966; should be fixed in HAL instead
-touch /media/.hal-mtab
 EOF
-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*
+%end
diff --git a/livecd-fedora-base-desktop.ks b/livecd-fedora-base-desktop.ks
new file mode 100644
index 0000000..bec87d9
--- /dev/null
+++ b/livecd-fedora-base-desktop.ks
@@ -0,0 +1,121 @@
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --enablemd5
+selinux --enforcing
+firewall --disabled
+xconfig --startxonboot
+services --enabled=NetworkManager,dhcdbd --disabled=network,sshd
+
+repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+
+%packages
+@base-x
+@base
+@core
+@admin-tools
+@dial-up
+@hardware-support
+kernel
+memtest86+
+
+# save some space
+-specspo
+-esc
+-samba-client
+-a2ps
+-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*
+
+# 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
+
+# configure X
+exists system-config-display --noui --reconfig --set-depth=24
+
+# 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
+
+# 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
+
+# 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
+
+# Stopgap fix for RH #217966; should be fixed in HAL instead
+touch /media/.hal-mtab
+EOF
+
+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*
+
+%end