Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts

Makefile.am

@@ -80,7 +80,7 @@ clean:
 	rm -f aclocal.m4 configure
 
 ChangeLog:
-	(GIT_DIR=.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	(GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
 rpm: ChangeLog dist
 	@(rpmbuild -ta ${PACKAGE}-$(PACKAGE_VERSION).tar.gz)

fedora-live-base.ks

@@ -296,7 +296,7 @@ touch /.liveimg-late-configured
 for o in \`cat /proc/cmdline\` ; do
     case \$o in
     ks=*)
-        ks="\${o#ks=}"
+        ks="--kickstart=\${o#ks=}"
         ;;
     xdriver=*)
         xdriver="--set-driver=\${o#xdriver=}"
@@ -388,6 +388,8 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+echo "Packages within this LiveCD"
+rpm -qa
 
 # go ahead and pre-make the man -k cache (#455968)
 /usr/sbin/makewhatis -w

fedora-livecd-kde.ks

@@ -26,21 +26,22 @@
 -kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 #-kdegames			# the removal of kdegames will free ~35 megs
 -kdeartwork-screensavers	# screensavers are not needed on live images
-#-kipi-plugins			# ~8 megs
-#-konq-plugins			# ~2 megs
+-kipi-plugins			# ~8 megs
+-konq-plugins			# ~2 megs
 -kdeplasma-addons		# ~5 megs
 
 # Additional packages that are not default in kde-desktop but useful
+-koffice-suite			# don't include whole koffice-suite, just parts of it
 koffice-kword
-koffice-kspread			# ~1 megs
-koffice-kpresenter		# ~3 megs
-koffice-filters
+#koffice-kspread		# ~1 megs
+#koffice-kpresenter		# ~3 megs
+#koffice-filters
 kdeartwork			# only include some parts of kdeartwork
 k3b
 #twinkle			# (~10 megs)
 fuse
 liveusb-creator
-pavucontrol			# nice to have but pulls in gstreamer (~3 megs)
+#pavucontrol			# nice to have but pulls in gstreamer (~3 megs)
 
 # use yum-presto by default
 yum-presto
@@ -148,6 +149,12 @@ restorecon -R /home/liveuser/
 # don't use prelink on a running KDE live image
 sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
 
+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
+
 EOF
 
 %end

fedora-livedvd-games.ks

@@ -121,7 +121,7 @@ CriticalMass
 dd2
 KoboDeluxe
 lacewing
-# Maelstrom License issue that might get fixed
+Maelstrom
 methane
 njam
 seahorse-adventures