Rebase with new livecd-fedora-desktop.ks

1 files changed, 55 insertions, 49 deletions

diff --git a/fedora-security-livecd.ks b/fedora-security-livecd.ks
index 62bfa7f..d60db55 100644
--- a/fedora-security-livecd.ks
+++ b/fedora-security-livecd.ks
@@ -5,7 +5,7 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --disabled
 repo --name=d7 --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/os
-repo --name=e7 --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/i386 
+repo --name=e7 --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/i386
 xconfig --startxonboot
 services --enabled=NetworkManager,dhcdbd --disabled=network,sshd
 
@@ -29,40 +29,17 @@ kernel
 scim*
 -scim-devel
 -scim-doc
-# work around yum API bug with specifying wildcards for now 
-scim-tables
-scim-tables-*
-scim-sinhala
-scim-libs
-scim-bridge
-scim-bridge-gtk
-scim-anthy
-scim-hangul
-scim-pinyin
-scim-chewing
-scim-m17n
+-scim-qtimm
+-scim-bridge-qt
+-scim-skk
+-scim-tomoe
+-scim-tables-chinese
 
 m17n-lib
 m17n-db
 #m17n-db-*
 
 fonts-*
-# work around yum API bug with specifying wildcards for now 
-fonts-arabic
-fonts-bengali
-fonts-chinese
-fonts-gujarati
-fonts-hebrew
-fonts-hindi
-fonts-japanese
-fonts-kannada
-fonts-korean
-fonts-malayalam
-fonts-oriya
-fonts-punjabi
-fonts-sinhala
-fonts-tamil
-fonts-telugu
 
 # dictionaries are big
 -aspell-*
@@ -74,9 +51,6 @@ fonts-telugu
 -compat*
 
 # space sucks
--festival
--gok
--gnome-speech
 -ekiga
 -gnome-user-docs
 -specspo
@@ -85,11 +59,18 @@ fonts-telugu
 -a2ps
 -vino
 -redhat-lsb
+-sox
 
 # 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
@@ -97,12 +78,26 @@ fonts-telugu
 # 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
+
+# lots of people want...
+gparted
+ntfs-3g
+ntfsprogs
 
 # livecd bits to set up the livecd and be able to install
 anaconda
+anaconda-runtime
 
-# Security LiveCD Tools
 # Other useful stuff
 irssi
 screen
@@ -146,20 +141,19 @@ xprobe2
 tcpxtract
 ettercap
 
-
 %post
 # FIXME: it'd be better to get this installed from a package
-cat > /etc/rc.d/init.d/fedora-livecd << EOF
+cat > /etc/rc.d/init.d/fedora-live << EOF
 #!/bin/bash
 #
-# livecd: Init script for live cd
+# live: Init script for live image
 #
 # chkconfig: 345 00 99
-# description: Init script for live cd.
+# description: Init script for live image.
 
 . /etc/init.d/functions
 
-if ! strstr "\`cat /proc/cmdline\`" livecd || [ "\$1" != "start" ] || [ -e /.livecd-configured ] ; then
+if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-configured ] ; then
     exit 0
 fi
 
@@ -168,11 +162,13 @@ exists() {
     \$*
 }
 
-touch /.livecd-configured
+touch /.liveimg-configured
 
-# mount livecd
-mkdir -p /mnt/livecd
-mount -o ro -t iso9660 /dev/livecd /mnt/livecd
+# 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
@@ -181,8 +177,10 @@ exists system-config-display --noui --reconfig --set-depth=24
 exists alsaunmute 0 2> /dev/null
 
 # add fedora user with no passwd
-useradd -c "Fedora live CD" fedora
+useradd -c "Fedora Live" fedora
 passwd -d fedora > /dev/null
+# 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
 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
@@ -193,14 +191,22 @@ fi
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
 # don't start yum-updatesd for livecd boots
-chkconfig --levels 345 yum-updatesd off
+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-livecd
-/sbin/restorecon /etc/rc.d/init.d/fedora-livecd
-/sbin/chkconfig --add fedora-livecd
+chmod 755 /etc/rc.d/init.d/fedora-live
+/sbin/restorecon /etc/rc.d/init.d/fedora-live
+/sbin/chkconfig --add fedora-live
 
-# big  hack, but how else can we fit?
-rm -rf /usr/share/doc/*
+# save a little bit of space at least...
+rm -f /boot/initrd*