fedora-livecd-design-suite.ks
by Sebastian Dziallas
fedora-livecd-design-suite.ks | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 534d2f357c58e4b74789c6fde009324f9b6991a4
Author: Sebastian Dziallas <sebastian(a)when.com>
Date: Thu Mar 25 17:39:48 2010 +0100
design-suite: reduce package set and add desktop link to inkscape course
diff --git a/fedora-livecd-design-suite.ks b/fedora-livecd-design-suite.ks
index b9dab99..08f6121 100644
--- a/fedora-livecd-design-suite.ks
+++ b/fedora-livecd-design-suite.ks
@@ -55,7 +55,7 @@ hamster-applet
empathy
evolution
firefox
-gnash-plugin
+# gnash-plugin
gwibber
# audio & video
@@ -66,9 +66,9 @@ totem
# system
gnome-utils
-tracker-search-tool
+# tracker-search-tool
vinagre
-vino
+# vino
%end
@@ -100,6 +100,19 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
# Turn off PackageKit-command-not-found while uninstalled
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+# Add link to the Inkscape Course
+cat >> /home/liveuser/Desktop/inkscape-course.desktop << FOE
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Introduction To Inkscape
+GenericName=Inkscape Course
+Comment=Materials from Máirín Duffy's Inkscape Class
+Exec=/usr/bin/firefox http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Type=Application
+Icon=fedora-logo-icon
+FOE
+chmod a+x /home/liveuser/Desktop/inkscape-course.desktop
+
EOF
%end
14 years
fedora-livecd-xfce.ks
by Kevin Fenzi
fedora-livecd-xfce.ks | 1 -
1 file changed, 1 deletion(-)
New commits:
commit e2dda732d9437e2bd160f38c7a309fceca116e27
Author: kevin <kevin(a)tummy.com>
Date: Wed Mar 24 20:50:08 2010 -0600
Remove inkscape for now
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 40549de..c3bb5b6 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -23,7 +23,6 @@ evince
-evince-dvi
-evince-djvu
gimp
-inkscape
# development
geany
14 years
2 commits - fedora-live-base.ks fedora-livecd-desktop.ks
by Colin Walters
fedora-live-base.ks | 4 ++++
fedora-livecd-desktop.ks | 4 ++++
2 files changed, 8 insertions(+)
New commits:
commit 834e61bfead4cbb2dd5146196cadaf8ccb0fb3f9
Author: Colin Walters <walters(a)verbum.org>
Date: Wed Mar 24 17:41:57 2010 -0400
Also exclude simple-scan and foomatic db
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 66fd0c8..9bc622c 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -14,6 +14,10 @@
-specspo
-xsane
+# No printing/scanning
+-foomatic-db-ppds
+-simple-scan
+
# dictionaries are big
-aspell-*
-hunspell-*
commit 2a68fde5981b3f8a6398e65e51c6dc281713a94d
Author: Colin Walters <walters(a)verbum.org>
Date: Wed Mar 24 17:41:41 2010 -0400
Readd anaconda and isomd5sum
Oops - these need to be in base.
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 460c8fa..6357bc0 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -50,6 +50,10 @@ kernel
# for now.
memtest86+
+# The point of a live image is to install
+anaconda
+isomd5sum
+
%end
%post
14 years
4 commits - fedora-live-base.ks fedora-livecd-desktop.ks fedora-livecd-kde.ks fedora-livecd-lxde.ks fedora-livecd-security.ks fedora-livecd-xfce.ks fedora-live-desktop.ks fedora-live-minimization.ks Makefile.am
by Colin Walters
Makefile.am | 3 ++
fedora-live-base.ks | 52 ++++-------------------------------
fedora-live-desktop.ks | 52 +++++++++++++++++++++++++++++++++++
fedora-live-minimization.ks | 31 ++++++++++++++++++++
fedora-livecd-desktop.ks | 65 ++++++--------------------------------------
fedora-livecd-kde.ks | 1
fedora-livecd-lxde.ks | 1
fedora-livecd-security.ks | 1
fedora-livecd-xfce.ks | 1
9 files changed, 106 insertions(+), 101 deletions(-)
New commits:
commit 6ade796a3602139dd77eb15fe4b649e2a7406be0
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 14:18:48 2010 -0400
Drop explicit festival reference, always remove smartmontools
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 07c772c..edb0279 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -14,9 +14,8 @@
# desktop image at some point. We won't touch this one for now.
nss-mdns
-# avoid weird case where we pull in more festival stuff than we need
-festival
-festvox-slt-arctic-hts
+# This one needs to be kicked out of @base
+-smartmontools
%end
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 4a38020..66fd0c8 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -28,17 +28,13 @@
-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
@@ -57,7 +53,6 @@
# drop some system-config things
-system-config-boot
-system-config-language
--system-config-lvm
-system-config-network
-system-config-rootpassword
-system-config-services
commit 0aec4c2c80dbf7ddbb217efb6999b19391ef8e6f
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 14:10:16 2010 -0400
PackagKit-command-not-found is now in comps
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 2e31f29..07c772c 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -10,10 +10,9 @@
@gnome-desktop
@office
-# FIXME - these two need to go in comps
+# FIXME; apparently the glibc maintainers dislike this, but it got put into the
+# desktop image at some point. We won't touch this one for now.
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
commit 5d24cf4d318345169ab3b9161f47007b348bbc46
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 12:58:51 2010 -0400
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
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
commit 198011f976ebdd2448fe1b25d907283aae24da8a
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 09:14:04 2010 -0400
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.
diff --git a/Makefile.am b/Makefile.am
index 4d5d94f..7577fa2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,12 @@ fedora_DATA = \
fedora-aos.ks \
fedora-install-fedora.ks \
fedora-live-base.ks \
+ fedora-live-minimization.ks \
fedora-live-mini.ks \
fedora-livecd-broffice.org.ks \
fedora-livecd-design-suite.ks \
+ fedora-live-desktop.ks \
+ fedora-live-desktop-minimization.ks \
fedora-livecd-desktop.ks \
fedora-livecd-kde.ks \
fedora-livecd-lxde.ks \
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index a319142..460c8fa 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -40,54 +40,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.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@fedoraproject.org
+
+%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
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
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 8b0058a..32f39d0 100644
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@@ -7,6 +7,7 @@
# - Christoph Wickert <cwickert(a)fedoraproject.org>
%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 9a9213c..9bbc4f3 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 90a0673..40549de 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -10,6 +10,7 @@
# - Adam Miller <maxamillion(a)gmail.com>
%include fedora-live-base.ks
+%include fedora-live-minimization.ks
%packages
14 years
fedora-live-base.ks
by Kevin Fenzi
fedora-live-base.ks | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 05c51b014625ed86848746fca9e3ad9578ff81fc
Author: kevin <kevin(a)tummy.com>
Date: Tue Mar 23 22:53:55 2010 -0600
Exclude ibus-pinyin-open-phrase
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index e46e15e..a319142 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -34,6 +34,8 @@ repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?re
@core
@fonts
@input-methods
+# Exclude ibus-pinyin-open-phrase as it's large and somewhat optional
+-ibus-pinyin-open-phrase
@admin-tools
@dial-up
@hardware-support
14 years
Changes to 'desktop-cd-comps-cleanup'
by Colin Walters
New branch 'desktop-cd-comps-cleanup' available with the following commits:
commit a2f45416e210f1b0bb944ab463b8e96f904ca071
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 14:18:48 2010 -0400
[desktop] Drop explicit festival reference, always remove smartmontools
commit c68cb6f45620f4e81c8b6d5d8c26063c2b25da83
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 14:10:16 2010 -0400
[desktop] PackagKit-command-not-found is now in comps
commit d5b45a62c20c64558cfcd2709461252353e41371
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 12:58:51 2010 -0400
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
commit 493624c223ce25504bced9955fb3cd7fe29055df
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 09:14:04 2010 -0400
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.
14 years
tools/list-packages-for-ks.py
by Colin Walters
tools/list-packages-for-ks.py | 100 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
New commits:
commit 71bb2c69b9cedada6d37f8de720a2b797f02280e
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Mar 23 10:05:59 2010 -0400
Add tools/ directory, with list-packages-for-ks.py
Add a script which prints the explicitly specified package list
for a given comps file and kickstart.
diff --git a/tools/list-packages-for-ks.py b/tools/list-packages-for-ks.py
new file mode 100755
index 0000000..0ec0eb2
--- /dev/null
+++ b/tools/list-packages-for-ks.py
@@ -0,0 +1,100 @@
+#!/usr/bin/python
+# Given as input a comps definition and a .ks file, list
+# the packages which would be installed. This list is
+# NOT depsolved, it's merely a textual list of explicitly
+# added or removed packages from the combined set.
+#
+# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
+# Copyright (C) 2010 Red Hat, Inc.
+# Written by Colin Walters <walters(a)verbum.org>
+
+import os
+import sys
+import getopt
+import xml.etree.cElementTree as ElementTree
+
+import pykickstart
+import pykickstart.parser
+import pykickstart.version
+
+def usage(ecode):
+ print "Usage: %s [--version=VERSION] COMPS.xml KICKSTART.ks" % (sys.argv[0], )
+ print "List packages installed by KICKSTART."
+ sys.exit(ecode)
+
+def main():
+ try:
+ opts,args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
+ except getopt.GetoptError, e:
+ usage(1)
+
+ version = None
+ debug = False
+ for o,a in opts:
+ if o in ('-h', '--help'):
+ usage(0)
+ elif o in ('--debug', ):
+ debug = True
+ elif o in ('--version', ):
+ version = a
+
+ if len(args) != 2:
+ usage(1)
+ comps_filename = args[0]
+ kickstart_filename = args[1]
+
+ if version:
+ version_cls = pykickstart.version.stringToVersion(version)
+ else:
+ version_cls = pykickstart.version.makeVersion()
+
+ comps = ElementTree.parse(comps_filename)
+
+ # pykickstart is going to look for files relative to
+ # the current directory of the kickstart file
+ working_directory = os.path.dirname(kickstart_filename)
+ if working_directory:
+ os.chdir(working_directory)
+
+ parser = pykickstart.parser.KickstartParser(version_cls)
+ parser.readKickstart(kickstart_filename)
+
+ comps_groups = comps.findall('group')
+ packages_for_group = {}
+ for group in comps_groups:
+ group_id = group.find('id')
+ assert group_id is not None
+ pkglist_node = group.find('packagelist')
+ assert pkglist_node is not None
+ reqs = pkglist_node.findall('packagereq')
+ pkglist = []
+ for req in reqs:
+ if req.attrib['type'] in ('default', 'mandatory'):
+ pkglist.append(req.text)
+ packages_for_group[group_id.text] = pkglist
+
+ pkg_list = set()
+
+ for group in parser.handler.packages.groupList:
+ if debug:
+ print >>sys.stderr, "# Including %d packages from group %r" % (len(packages_for_group[group.name]), group.name)
+ for pkg in packages_for_group[group.name]:
+ pkg_list.add(pkg)
+ if debug:
+ print >>sys.stderr, "# Adding %d explicitly specified packages" % (len(parser.handler.packages.packageList), )
+ for pkg in parser.handler.packages.packageList:
+ pkg_list.add(pkg)
+ if debug:
+ print >>sys.stderr, "# Processing %d explicitly excluded packages" % (len(parser.handler.packages.excludedList), )
+ for pkg in parser.handler.packages.excludedList:
+ if pkg in pkg_list:
+ pkg_list.remove(pkg)
+
+ for pkg in sorted(pkg_list):
+ print "%s" % (pkg, )
+
+ sys.exit(0)
+
+if __name__ == '__main__':
+ main()
+
14 years
fedora-install-fedora.ks
by Jesse Keating
fedora-install-fedora.ks | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 9b2696fe94e81e9dfa104dc00b2f3fc0acb80590
Author: Jesse Keating <jkeating(a)redhat.com>
Date: Tue Mar 23 12:50:54 2010 -0700
Use the new filesystems group to get support rpms.
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index afcbba5..1c968de 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -63,9 +63,7 @@ wireshark-gnome
# Virt group
@virtualization --optional
# filesystem stuff
-reiserfs-utils
-xfsprogs
-jfsutils
+@filesystems
# Languages
@afrikaans-support
@albanian-support
14 years, 1 month
2 commits - fedora-livecd-lxde.ks fedora-livecd-security.ks
by Christoph Wickert
fedora-livecd-lxde.ks | 7 ++-----
fedora-livecd-security.ks | 23 ++++++++++-------------
2 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit ad6311931264f48ed10ee52802ebd96f8a33597f
Author: Christoph Wickert <fedora(a)christoph-wickert.de>
Date: Tue Mar 23 19:42:50 2010 +0100
Security: Sync LXDE and LXDM configuration with LXDE spin
diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index d5a63ff..9a9213c 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -170,30 +170,26 @@ PolicyKit-gnome
%end
%post
-
-# set up auto-login for liveuser
-cat >> /etc/slim.conf << FOE
-auto_login yes
-default_user liveuser
-FOE
+# LXDE and LXDM configuration
# create /etc/sysconfig/desktop (needed for installation)
-cat >> /etc/sysconfig/desktop <<EOF
+cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startlxde
-DISPLAYMANAGER=/usr/bin/slim-dynwm
+DISPLAYMANAGER=/usr/sbin/lxdm
EOF
cat >> /etc/rc.d/init.d/livesys << EOF
# disable screensaver locking and make sure gamin gets started
-rm -f /etc/xdg/lxsession/LXDE/autostart
-cat >> /etc/xdg/lxsession/LXDE/autostart << FOE
+cat > /etc/xdg/lxsession/LXDE/autostart << FOE
/usr/libexec/gam_server
-@lxde-settings-daemon
-@pulseaudio -D
@lxpanel --profile LXDE
@pcmanfm -d
+@pulseaudio -D
FOE
+# set up auto-login for liveuser
+sed -i 's|# autologin=dgod|autologin=liveuser|g' /etc/lxdm/lxdm.conf
+
# Show harddisk install on the desktop
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop
@@ -202,9 +198,10 @@ cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# Add autostart for parcellite
cp /usr/share/applications/fedora-parcellite.desktop /etc/xdg/autostart
-#last thing to do
+# this goes at the end after all other changes.
chown -R liveuser:liveuser /home/liveuser
restorecon -R /home/liveuser
+
EOF
%end
commit 8ca163d935c1be7e1d72c2110993aa5fd83e1089
Author: Christoph Wickert <fedora(a)christoph-wickert.de>
Date: Tue Mar 23 19:41:51 2010 +0100
LXDE: fix LXDM autologin
diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks
index 708b12f..8b0058a 100644
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@@ -108,10 +108,9 @@ ssmtp
%end
%post
-# LXDE and SLiM configuration
+# LXDE and LXDM configuration
# create /etc/sysconfig/desktop (needed for installation)
-
cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startlxde
DISPLAYMANAGER=/usr/sbin/lxdm
@@ -134,9 +133,7 @@ MailClient=redhat-sylpheed.desktop
FOE
# set up auto-login for liveuser
-cat >> /etc/lxdm/lxdm.conf << FOE
-autologin=liveuser
-FOE
+sed -i 's|# autologin=dgod|autologin=liveuser|g' /etc/lxdm/lxdm.conf
# Show harddisk install on the desktop
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
14 years, 1 month
fedora-livecd-xfce.ks
by Kevin Fenzi
fedora-livecd-xfce.ks | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 051abde97339c59d9a45a3cefa69f7914983f4db
Author: kevin <kevin(a)tummy.com>
Date: Tue Mar 23 11:05:21 2010 -0600
Remove java group and just include the plugin we want
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 055ab51..90a0673 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -64,7 +64,8 @@ parole-mozplugin
xfburn
# More Desktop stuff
-@java
+# java plugin
+java-1.6.0-openjdk-plugin
NetworkManager-vpnc
NetworkManager-openvpn
NetworkManager-gnome
14 years, 1 month
