From 198011f976ebdd2448fe1b25d907283aae24da8a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 23 Mar 2010 09:14:04 -0400 Subject: Rework live-base and desktop minimization First, strip the "minimization" parts out of fedora-live-base.ks, and move them into fedora-live-minimization.ks. All previous consumers of fedora-live-base.ks are updated. The old fedora-live-base.ks was conflating two entirely different things: * A live-based image which can be used to install * Stripping some random bits to fit onto a CD The previous fedora-livecd-desktop is now fedora-live-desktop.ks. The new file fedora-livecd-desktop.ks is actually further minimizations on top of fedora-live-desktop.ks. Split up these two concepts so that fedora-live-desktop is *THE* desktop. What we expect everyone to have as a base, and the exact same set of packages should be installed by Standalone Anaconda (DVD) as well. Then, we have minimization hacks in fedora-live-desktop-cd.ks. Over time, we should be shrinking the default install and making it more just-in-time, by e.g. having many more things use the PackageKit library to pull in components as needed. --- fedora-livecd-desktop.ks | 60 ++++++++---------------------------------------- 1 file changed, 9 insertions(+), 51 deletions(-) (limited to 'fedora-livecd-desktop.ks') diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 9d78fc5..4a38020 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -1,24 +1,18 @@ +# Desktop with customizationst to fit in a CD sized image (package removals, etc.) # Maintained by the Fedora Desktop SIG: # http://fedoraproject.org/wiki/SIGs/Desktop -# mailto:fedora-desktop-list@redhat.com +# mailto:fedora-desktop-list@fedoraproject.org -## NOTE: -# This file should in general be *subtraction* from the gnome-desktop -# comps group to fit within a CD-sized image. If you want to add -# a package to the desktop, add them to the comps group. - -%include fedora-live-base.ks +%include fedora-live-desktop.ks +%include fedora-live-minimization.ks %packages -@graphical-internet -@sound-and-video -@gnome-desktop -@office -nss-mdns +# First, no office. +-openoffice.org-* -# avoid weird case where we pull in more festival stuff than we need -festival -festvox-slt-arctic-hts +# Temporary list of things removed from comps but not synced yet +-specspo +-xsane # dictionaries are big -aspell-* @@ -68,40 +62,4 @@ festvox-slt-arctic-hts -system-config-rootpassword -system-config-services -policycoreutils-gui - -# use the PackageKit helper for bash -PackageKit-command-not-found - -%end - -%post -cat >> /etc/rc.d/init.d/livesys << 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 -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null - -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -TimedLoginEnable=true -TimedLogin=liveuser -TimedLoginDelay=60 -FOE - -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chown -R liveuser.liveuser /home/liveuser/Desktop -chmod a+x /home/liveuser/Desktop/liveinst.desktop - -# But not trash and home -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null - -# Turn off PackageKit-command-not-found while uninstalled -sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf - -EOF - %end -- cgit