As you may or may not know I've been unhappy with how the Live image
path has diverged from the automated install path (standalone anaconda
+ @gnome-desktop) for the desktop.
Attached is a series of patches to both comps and spin-kickstarts
which has a a high level goal of moving the two closer.
Basically there are 3 fundamentally separate concepts which got intertwined:
* Bits necessary for running a Live OS (turning off cron, etc)
* Removing things we do want to fit into a CD
* Removing "traditional Unix workstation" or other stuff that @base
grew we don't want in @desktop regardless of space
The comps patches come first, then the spin-kickstart patches.
This isn't complete but I think it's a noticeable improvement. We
still have more comps gardening to do. Note the spin-kickstart
patches obsolete the second of the patch I sent earlier.
From 018bf8e7ca32a45b040b50bde0461d4dac3f9b31 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 23 Mar 2010 08:47:48 -0400
Subject: [PATCH 1/4] Delete all optional components from @gnome-desktop
Optional components are currently only visible from the UI
in Standalone Anaconda, and are a random grab bag of
* Applications
* System administration tools
* Desktop UI replacement
* Other arbitrary software that links to gtk2 and gconf
Going through this list:
Applications:
Now browseable in packagedb
System admin tools:
Should move into the Fedora Deployment Guide probably
Desktop UI replacement:
I don't think we should (or need to) advertise these.
People who want them either know how to get them, or
are going to follow instructions from an upstream
wiki page.
Other arbitrary software:
Just no.
---
comps-f13.xml.in | 76 ------------------------------------------------------
comps-f14.xml.in | 76 ------------------------------------------------------
2 files changed, 0 insertions(+), 152 deletions(-)
diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index f9658fc..53d74f7 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -2642,82 +2642,6 @@
<packagereq type="default">vino</packagereq>
<packagereq type="default">xdg-user-dirs-gtk</packagereq>
<packagereq type="default">zenity</packagereq>
- <packagereq type="optional">alacarte</packagereq>
- <packagereq type="optional">avant-window-navigator</packagereq>
- <packagereq type="optional">beagle-evolution</packagereq>
- <packagereq type="optional">beagle-gnome</packagereq>
- <packagereq type="optional">buoh</packagereq>
- <packagereq type="optional">byzanz</packagereq>
- <packagereq type="optional">control-center-extra</packagereq>
- <packagereq type="optional">dasher</packagereq>
- <packagereq type="optional">deskbar-applet</packagereq>
- <packagereq type="optional">esc</packagereq>
- <packagereq type="optional">evince-djvu</packagereq>
- <packagereq type="optional">evince-dvi</packagereq>
- <packagereq type="optional">file-browser-applet</packagereq>
- <packagereq type="optional">gconf-editor</packagereq>
- <packagereq type="optional">gdesklets</packagereq>
- <packagereq type="optional">gedit-plugins</packagereq>
- <packagereq type="optional">glipper</packagereq>
- <packagereq type="optional">glunarclock</packagereq>
- <packagereq type="optional">gmpc</packagereq>
- <packagereq type="optional">gmrun</packagereq>
- <packagereq type="optional">gnochm</packagereq>
- <packagereq type="optional">gnome-applet-alarm-clock</packagereq>
- <packagereq type="optional">gnome-applet-bubblemon</packagereq>
- <packagereq type="optional">gnome-applet-cpufire</packagereq>
- <packagereq type="optional">gnome-applet-music</packagereq>
- <packagereq type="optional">gnome-applet-netspeed</packagereq>
- <packagereq type="optional">gnome-applet-sensors</packagereq>
- <packagereq type="optional">gnome-applet-timer</packagereq>
- <packagereq type="optional">gnome-commander</packagereq>
- <packagereq type="optional">gnome-device-manager</packagereq>
- <packagereq type="optional">gnome-media-apps</packagereq>
- <packagereq type="optional">gnome-netstatus</packagereq>
- <packagereq type="optional">gnome-phone-manager</packagereq>
- <packagereq type="optional">gnome-pilot-conduits</packagereq>
- <packagereq type="optional">gnome-schedule</packagereq>
- <packagereq type="optional">gnome-system-log</packagereq>
- <packagereq type="optional">gnome-theme-curvylooks</packagereq>
- <packagereq type="optional">gnotime</packagereq>
- <packagereq type="optional">gonvert</packagereq>
- <packagereq type="optional">grsync</packagereq>
- <packagereq type="optional">gst-mixer</packagereq>
- <packagereq type="optional">gthumb</packagereq>
- <packagereq type="optional">gtrayicon</packagereq>
- <packagereq type="optional">gtweakui</packagereq>
- <packagereq type="optional">gvfs-obexftp</packagereq>
- <packagereq type="optional">hamster-applet</packagereq>
- <packagereq type="optional">istanbul</packagereq>
- <packagereq type="optional">lock-keys-applet</packagereq>
- <packagereq type="optional">nautilus-actions</packagereq>
- <packagereq type="optional">nautilus-image-converter</packagereq>
- <packagereq type="optional">nautilus-open-terminal</packagereq>
- <packagereq type="optional">nautilus-search-tool</packagereq>
- <packagereq type="optional">nautilus-sound-converter</packagereq>
- <packagereq type="optional">panelfm</packagereq>
- <packagereq type="optional">pcmanfm</packagereq>
- <packagereq type="optional">preferences-menus</packagereq>
- <packagereq type="optional">pulseaudio-esound-compat</packagereq>
- <packagereq type="optional">qtcurve-gtk2</packagereq>
- <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
- <packagereq type="optional">sabayon</packagereq>
- <packagereq type="optional">scim-gtk</packagereq>
- <packagereq type="optional">screenruler</packagereq>
- <packagereq type="optional">seahorse-plugins</packagereq>
- <packagereq type="optional">stardict-dic-en</packagereq>
- <packagereq type="optional">swfdec-gnome</packagereq>
- <packagereq type="optional">tango-icon-theme</packagereq>
- <packagereq type="optional">tango-icon-theme-extras</packagereq>
- <packagereq type="optional">themes-backgrounds-gnome</packagereq>
- <packagereq type="optional">tomboy</packagereq>
- <packagereq type="optional">tracker-search-tool</packagereq>
- <packagereq type="optional">verbiste-gnome</packagereq>
- <packagereq type="optional">wallpapoz</packagereq>
- <packagereq type="optional">wp_tray</packagereq>
- <packagereq type="optional">xiphos</packagereq>
- <packagereq type="optional">xscreensaver-extras-gss</packagereq>
- <packagereq type="optional">xscreensaver-gl-extras-gss</packagereq>
</packagelist>
</group>
<group>
diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 3bbd244..48b01ed 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -2637,82 +2637,6 @@
<packagereq type="default">vino</packagereq>
<packagereq type="default">xdg-user-dirs-gtk</packagereq>
<packagereq type="default">zenity</packagereq>
- <packagereq type="optional">alacarte</packagereq>
- <packagereq type="optional">avant-window-navigator</packagereq>
- <packagereq type="optional">beagle-evolution</packagereq>
- <packagereq type="optional">beagle-gnome</packagereq>
- <packagereq type="optional">buoh</packagereq>
- <packagereq type="optional">byzanz</packagereq>
- <packagereq type="optional">control-center-extra</packagereq>
- <packagereq type="optional">dasher</packagereq>
- <packagereq type="optional">deskbar-applet</packagereq>
- <packagereq type="optional">esc</packagereq>
- <packagereq type="optional">evince-djvu</packagereq>
- <packagereq type="optional">evince-dvi</packagereq>
- <packagereq type="optional">file-browser-applet</packagereq>
- <packagereq type="optional">gconf-editor</packagereq>
- <packagereq type="optional">gdesklets</packagereq>
- <packagereq type="optional">gedit-plugins</packagereq>
- <packagereq type="optional">glipper</packagereq>
- <packagereq type="optional">glunarclock</packagereq>
- <packagereq type="optional">gmpc</packagereq>
- <packagereq type="optional">gmrun</packagereq>
- <packagereq type="optional">gnochm</packagereq>
- <packagereq type="optional">gnome-applet-alarm-clock</packagereq>
- <packagereq type="optional">gnome-applet-bubblemon</packagereq>
- <packagereq type="optional">gnome-applet-cpufire</packagereq>
- <packagereq type="optional">gnome-applet-music</packagereq>
- <packagereq type="optional">gnome-applet-netspeed</packagereq>
- <packagereq type="optional">gnome-applet-sensors</packagereq>
- <packagereq type="optional">gnome-applet-timer</packagereq>
- <packagereq type="optional">gnome-commander</packagereq>
- <packagereq type="optional">gnome-device-manager</packagereq>
- <packagereq type="optional">gnome-media-apps</packagereq>
- <packagereq type="optional">gnome-netstatus</packagereq>
- <packagereq type="optional">gnome-phone-manager</packagereq>
- <packagereq type="optional">gnome-pilot-conduits</packagereq>
- <packagereq type="optional">gnome-schedule</packagereq>
- <packagereq type="optional">gnome-system-log</packagereq>
- <packagereq type="optional">gnome-theme-curvylooks</packagereq>
- <packagereq type="optional">gnotime</packagereq>
- <packagereq type="optional">gonvert</packagereq>
- <packagereq type="optional">grsync</packagereq>
- <packagereq type="optional">gst-mixer</packagereq>
- <packagereq type="optional">gthumb</packagereq>
- <packagereq type="optional">gtrayicon</packagereq>
- <packagereq type="optional">gtweakui</packagereq>
- <packagereq type="optional">gvfs-obexftp</packagereq>
- <packagereq type="optional">hamster-applet</packagereq>
- <packagereq type="optional">istanbul</packagereq>
- <packagereq type="optional">lock-keys-applet</packagereq>
- <packagereq type="optional">nautilus-actions</packagereq>
- <packagereq type="optional">nautilus-image-converter</packagereq>
- <packagereq type="optional">nautilus-open-terminal</packagereq>
- <packagereq type="optional">nautilus-search-tool</packagereq>
- <packagereq type="optional">nautilus-sound-converter</packagereq>
- <packagereq type="optional">panelfm</packagereq>
- <packagereq type="optional">pcmanfm</packagereq>
- <packagereq type="optional">preferences-menus</packagereq>
- <packagereq type="optional">pulseaudio-esound-compat</packagereq>
- <packagereq type="optional">qtcurve-gtk2</packagereq>
- <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
- <packagereq type="optional">sabayon</packagereq>
- <packagereq type="optional">scim-gtk</packagereq>
- <packagereq type="optional">screenruler</packagereq>
- <packagereq type="optional">seahorse-plugins</packagereq>
- <packagereq type="optional">stardict-dic-en</packagereq>
- <packagereq type="optional">swfdec-gnome</packagereq>
- <packagereq type="optional">tango-icon-theme</packagereq>
- <packagereq type="optional">tango-icon-theme-extras</packagereq>
- <packagereq type="optional">themes-backgrounds-gnome</packagereq>
- <packagereq type="optional">tomboy</packagereq>
- <packagereq type="optional">tracker-search-tool</packagereq>
- <packagereq type="optional">verbiste-gnome</packagereq>
- <packagereq type="optional">wallpapoz</packagereq>
- <packagereq type="optional">wp_tray</packagereq>
- <packagereq type="optional">xiphos</packagereq>
- <packagereq type="optional">xscreensaver-extras-gss</packagereq>
- <packagereq type="optional">xscreensaver-gl-extras-gss</packagereq>
</packagelist>
</group>
<group>
--
1.6.6.1
From 93f49920a2528dd64870b2119ec200f3cec70ec4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 23 Mar 2010 12:24:04 -0400
Subject: [PATCH 2/4] Move vorbis-tools to optional
In @desktop, there's no reason for this to be mandatory. On @server,
you aren't going to be including @sound-and-video anyways.
---
comps-f13.xml.in | 2 +-
comps-f14.xml.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 53d74f7..599d221 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -5173,7 +5173,6 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="mandatory">alsa-utils</packagereq>
- <packagereq type="mandatory">vorbis-tools</packagereq>
<packagereq type="default">alsa-plugins-pulseaudio</packagereq>
<packagereq type="default">brasero</packagereq>
<packagereq type="default">cdparanoia</packagereq>
@@ -5296,6 +5295,7 @@
<packagereq type="optional">vdr-tvonscreen</packagereq>
<packagereq type="optional">vdr-wapd</packagereq>
<packagereq type="optional">vdradmin-am</packagereq>
+ <packagereq type="optional">vorbis-tools</packagereq>
<packagereq type="optional">whaawmp</packagereq>
<packagereq type="optional">wmix</packagereq>
<packagereq type="optional">xcdroast</packagereq>
diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 48b01ed..88835e4 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -5162,7 +5162,6 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="mandatory">alsa-utils</packagereq>
- <packagereq type="mandatory">vorbis-tools</packagereq>
<packagereq type="default">alsa-plugins-pulseaudio</packagereq>
<packagereq type="default">brasero</packagereq>
<packagereq type="default">cdparanoia</packagereq>
@@ -5285,6 +5284,7 @@
<packagereq type="optional">vdr-tvonscreen</packagereq>
<packagereq type="optional">vdr-wapd</packagereq>
<packagereq type="optional">vdradmin-am</packagereq>
+ <packagereq type="optional">vorbis-tools</packagereq>
<packagereq type="optional">whaawmp</packagereq>
<packagereq type="optional">wmix</packagereq>
<packagereq type="optional">xcdroast</packagereq>
--
1.6.6.1
From 7fa8367b55b27837c93ddf30aa611f9744644243 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 23 Mar 2010 12:57:35 -0400
Subject: [PATCH 3/4] Remove specspo
Not maintained or useful.
---
comps-f13.xml.in | 1 -
comps-f14.xml.in | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 599d221..5dccb2d 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -290,7 +290,6 @@
<packagereq type="default">setuptool</packagereq>
<packagereq type="default">smartmontools</packagereq>
<packagereq type="default">sos</packagereq>
- <packagereq type="default">specspo</packagereq>
<packagereq type="default">sssd</packagereq>
<packagereq type="default">stunnel</packagereq>
<packagereq type="default">sudo</packagereq>
diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 88835e4..f67f31f 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -290,7 +290,6 @@
<packagereq type="default">setuptool</packagereq>
<packagereq type="default">smartmontools</packagereq>
<packagereq type="default">sos</packagereq>
- <packagereq type="default">specspo</packagereq>
<packagereq type="default">sssd</packagereq>
<packagereq type="default">stunnel</packagereq>
<packagereq type="default">sudo</packagereq>
--
1.6.6.1
From 4d75de9ad3e5c3fed835b2093052d4022df81de1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 23 Mar 2010 13:04:21 -0400
Subject: [PATCH 4/4] Downgrade pinfo to optional
Several core things depend on info; it just doesn't make sense to have
two info viewers.
---
comps-f13.xml.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 5dccb2d..c0b33e2 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -276,7 +276,6 @@
<packagereq type="default">pam_smb</packagereq>
<packagereq type="default">pcmciautils</packagereq>
<packagereq type="default">perf</packagereq>
- <packagereq type="default">pinfo</packagereq>
<packagereq type="default">pm-utils</packagereq>
<packagereq type="default">prctl</packagereq>
<packagereq type="default">prelink</packagereq>
@@ -335,6 +334,7 @@
<packagereq type="optional">mkbootdisk</packagereq>
<packagereq type="optional">mtools</packagereq>
<packagereq type="optional">pax</packagereq>
+ <packagereq type="optional">pinfo</packagereq>
<packagereq type="optional">redhat-lsb</packagereq>
<packagereq type="optional">reiserfs-utils</packagereq>
<packagereq type="optional">squashfs-tools</packagereq>
--
1.6.6.1
From 2921e048d3f704154622847af3b09d80990ae323 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 23 Mar 2010 09:14:04 -0400
Subject: [PATCH 1/2] 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
Next, rename fedora-livecd-desktop to fedora-live-desktop.ks, add -cd.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-live-base.ks | 52 +++------------------
fedora-live-desktop-cd.ks | 58 +++++++++++++++++++++++
fedora-live-desktop.ks | 54 ++++++++++++++++++++++
fedora-live-minimization.ks | 41 ++++++++++++++++
fedora-livecd-desktop.ks | 107 -------------------------------------------
fedora-livecd-kde.ks | 1 +
fedora-livecd-lxde.ks | 1 +
fedora-livecd-security.ks | 1 +
fedora-livecd-xfce.ks | 1 +
9 files changed, 164 insertions(+), 152 deletions(-)
create mode 100644 fedora-live-desktop-cd.ks
create mode 100644 fedora-live-desktop.ks
create mode 100644 fedora-live-minimization.ks
delete mode 100644 fedora-livecd-desktop.ks
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index e46e15e..5760080 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -38,54 +38,16 @@ repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?re
@dial-up
@hardware-support
@printing
+
+# Explicitly specified here:
+# <notting> walters: because otherwise dependency loops cause yum issues.
kernel
+
+# This was added a while ago, I think it falls into the category of
+# "Diagnosis/recovery tool useful from a Live OS image". Leaving this untouched
+# for now.
memtest86+
-#firstaidkit-plugin-all
-
-# save some space
--specspo
--esc
--samba-client
--a2ps
--mpage
--redhat-lsb
--sox
--hplip
--hpijs
-sendmail
-#ssmtp
--numactl
--isdn4k-utils
--autofs
-# 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
-
-# livecd bits to set up the livecd and be able to install
-anaconda
-isomd5sum
-
-# commented out to avoid warning
-# # make sure debuginfo doesn't end up on the live image
-#-*debuginfo
%end
%post
diff --git a/fedora-live-desktop-cd.ks b/fedora-live-desktop-cd.ks
new file mode 100644
index 0000000..089fa9e
--- /dev/null
+++ b/fedora-live-desktop-cd.ks
@@ -0,0 +1,58 @@
+# 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@xxxxxxxxxxxxxxxxx
+
+%include fedora-live-desktop.ks
+%include fedora-live-minimization.ks
+
+%packages
+# dictionaries are big
+-aspell-*
+-hunspell-*
+-man-pages*
+-words
+
+# save some space
+-gnome-user-docs
+-evolution-help
+-gnome-games-help
+-nss_db
+-isdn4k-utils
+-desktop-backgrounds-basic
+-constantine-backgrounds-extras
+
+# things we don't need here
+-seahorse
+-alacarte
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-acpid
+-nano
+-smartmontools
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-telnet
+-unix2dos
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+
+# drop some system-config things
+-system-config-boot
+-system-config-language
+-system-config-lvm
+-system-config-network
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+%end
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
new file mode 100644
index 0000000..2e31f29
--- /dev/null
+++ b/fedora-live-desktop.ks
@@ -0,0 +1,54 @@
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:fedora-desktop-list@xxxxxxxxxxxxxxxxx
+
+%include fedora-live-base.ks
+
+%packages
+@graphical-internet
+@sound-and-video
+@gnome-desktop
+@office
+
+# FIXME - these two need to go in comps
+nss-mdns
+# use the PackageKit helper for bash
+PackageKit-command-not-found
+
+# avoid weird case where we pull in more festival stuff than we need
+festival
+festvox-slt-arctic-hts
+
+%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
diff --git a/fedora-live-minimization.ks b/fedora-live-minimization.ks
new file mode 100644
index 0000000..2717e8e
--- /dev/null
+++ b/fedora-live-minimization.ks
@@ -0,0 +1,41 @@
+# Common packages removed from comps
+# For F14, these removals should be moved to comps itself
+
+%packages
+
+# save some space
+-specspo
+-esc
+-samba-client
+-a2ps
+-mpage
+-redhat-lsb
+-sox
+-hplip
+-hpijs
+#ssmtp
+-numactl
+-isdn4k-utils
+-autofs
+# 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
+
+%end
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
deleted file mode 100644
index 9d78fc5..0000000
--- a/fedora-livecd-desktop.ks
+++ /dev/null
@@ -1,107 +0,0 @@
-# Maintained by the Fedora Desktop SIG:
-# http://fedoraproject.org/wiki/SIGs/Desktop
-# mailto:fedora-desktop-list@xxxxxxxxxx
-
-## 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
-
-%packages
-@graphical-internet
-@sound-and-video
-@gnome-desktop
-@office
-nss-mdns
-
-# avoid weird case where we pull in more festival stuff than we need
-festival
-festvox-slt-arctic-hts
-
-# dictionaries are big
--aspell-*
--hunspell-*
--man-pages*
--words
-
-# save some space
--gnome-user-docs
--evolution-help
--gnome-games-help
--nss_db
--isdn4k-utils
--desktop-backgrounds-basic
--constantine-backgrounds-extras
-
-# things we don't need here
--seahorse
--alacarte
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--acpid
--nano
--smartmontools
--minicom
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--telnet
--unix2dos
--nfs-utils
--ypbind
--yp-tools
--rpcbind
-
-# drop some system-config things
--system-config-boot
--system-config-language
--system-config-lvm
--system-config-network
--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
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index bfb5e4d..9000750 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -8,6 +8,7 @@
# - Fedora KDE SIG
%include fedora-live-base.ks
+%include fedora-live-minimization.ks
%packages
diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks
index 708b12f..0d3bf1d 100644
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@@ -7,6 +7,7 @@
# - Christoph Wickert <cwickert@xxxxxxxxxxxxxxxxx>
%include fedora-live-base.ks
+%include fedora-live-minimization.ks
%packages
# LXDE desktop
diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index d5a63ff..fbf5dd7 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -13,6 +13,7 @@
%include fedora-live-base.ks
+%include fedora-live-minimization.ks
%packages
security-menus
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 055ab51..1b739b6 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -10,6 +10,7 @@
# - Adam Miller <maxamillion@xxxxxxxxx>
%include fedora-live-base.ks
+%include fedora-live-minimization.ks
%packages
--
1.6.6.1
From cc6edfade56c4549175ddd3d99a88493e7b37d4a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@xxxxxxxxxx>
Date: Tue, 23 Mar 2010 12:58:51 -0400
Subject: [PATCH 2/2] Update live-minimization.ks with comps changes
* Is not in comps currently (or is optional)
esc
redhat-lsp
a2ps
compat-* (is only in non-default groups)
* Removed from comps with my patches (or is now optional)
specspo
vorbis-tools
pinfo
---
fedora-live-minimization.ks | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/fedora-live-minimization.ks b/fedora-live-minimization.ks
index 2717e8e..6ce962f 100644
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -4,28 +4,18 @@
%packages
# save some space
--specspo
--esc
-samba-client
--a2ps
-mpage
--redhat-lsb
-sox
-hplip
-hpijs
-#ssmtp
-numactl
-isdn4k-utils
-autofs
# 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
--
1.6.6.1
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
