fedora-livecd-desktop-default.ks | 5 ++ fedora-livecd-xfce.ks | 89 ++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 46 deletions(-) New commits: commit 36f1b2c6a5c4ae103ecca2512655b84ff49110ed Author: Jesse Keating <jkeating(a)redhat.com&gt; Date: Thu Sep 25 21:57:09 2008 +0000 Scrub some things from beta to fit size wise. diff --git a/fedora-livecd-desktop-default.ks b/fedora-livecd-desktop-default.ks index e7a9193..94e51ae 100644 --- a/fedora-livecd-desktop-default.ks +++ b/fedora-livecd-desktop-default.ks @@ -10,6 +10,11 @@ keyboard us timezone US/Eastern %packages +# space issues for beta +-gnome-games* +-firstaidkit* +-yelp +-bluecurve-icon-theme @albanian-support @arabic-support @assamese-support commit 09285096aeb067c68c6d2baed6aacb3a66a9ec95 Author: Rahul Sundaram <sundaram(a)sundaram.pnq.redhat.com&gt; Date: Fri Sep 26 02:28:01 2008 +0530 fix gnome session desktop file path diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 0729007..866197d 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -178,7 +178,7 @@ EOF # remove this session file from gnome-session package to make xfce the default # temporary hack till this file is split up from the package -rm -rf /usr/share/xsessions/gnome.session +rm -rf /usr/share/xsessions/gnome.desktop %end commit 0452586df0650bbc1573dd6c3540978035f9c054 Author: Rahul Sundaram <sundaram(a)sundaram.pnq.redhat.com&gt; Date: Thu Sep 25 23:49:47 2008 +0530 gnome session hack diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index ca1b866..0729007 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -173,6 +173,12 @@ FOE EOF +%post + +# remove this session file from gnome-session package to make xfce the default +# temporary hack till this file is split up from the package + +rm -rf /usr/share/xsessions/gnome.session %end commit 736cd2ccd392b0101988390dce45f42671238552 Author: root <root(a)sundaram.pnq.redhat.com&gt; Date: Thu Sep 25 21:51:08 2008 +0530 include gnome-session diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 0863f4b..ca1b866 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -11,6 +11,11 @@ %include fedora-live-base.ks %packages + +# gdm depends on gnome-session but lacks a dependency. Temporary workaround + +gnome-session + firefox NetworkManager-vpnc NetworkManager-openvpn commit 9dfcca16846ebac16b9e6c7598030fd2f69b550a Author: Rahul Sundaram <sundaram(a)sundaram.pnq.redhat.com&gt; Date: Thu Sep 25 17:00:25 2008 +0530 match desktop ks file settings diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 53c7e3c..0863f4b 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -17,14 +17,20 @@ NetworkManager-openvpn NetworkManager-gnome NetworkManager-pptp +#nss-mdns + # we don't include @office so that we don't get OOo. but some nice bits abiword gnumeric + evince -evince-dvi +-evince-djvu + gimp inkscape + galculator desktop-backgrounds-compat gnome-screensaver @@ -65,7 +71,6 @@ wget irssi mutt yum-utils -ssmtp # xfce packages @xfce-desktop @@ -101,21 +106,23 @@ xfce4-websearch-plugin xfwm4-themes # dictionaries are big --aspell-* --man-pages-* --scim-tables-* +#-aspell-* +#-man-pages-* +#-scim-tables-* # more fun with space saving --scim-lang-chinese -scim-chewing -scim-pinyin +#-scim-lang-chinese +#scim-chewing +#scim-pinyin -gimp-help + # save some space -autofs -nss_db -sendmail - +ssmtp +-acpid # system-config-printer does printer management better # xfprint has now been made as optional in comps. system-config-printer @@ -148,20 +155,19 @@ EOF cat >> /etc/rc.d/init.d/fedora-live << EOF chown -R fedora:fedora /home/fedora -# set up timed auto-login for after 10 seconds -cat >> /etc/gdm/custom.conf << _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 +# set up timed auto-login for after 60 seconds +cat >> /etc/gdm/custom.conf << FOE [daemon] TimedLoginEnable=true TimedLogin=fedora -TimedLoginDelay=10 -_EOF_ - -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 - # TODO: would be nice to get e-d-s to pick this one up too... but how? -fi +TimedLoginDelay=60 +FOE + EOF + + %end commit 3c0c209487ab2246346064616f8e44f1d07d9835 Author: Rahul Sundaram <sundaram(a)sundaram.pnq.redhat.com&gt; Date: Thu Sep 25 16:45:23 2008 +0530 add other xfce sig members as maintainers diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index f45c750..53c7e3c 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -4,7 +4,9 @@ # - Fedora Live Spin with the light-weight XFCE Desktop Environment # # Maintainer(s): -# - Rahul Sundaram <sundaram a fedoraproject.org> +# - Rahul Sundaram <sundaram(a)fedoraproject.org&gt; +# - Christoph Wickert <chris(a)christoph-wickert.de&gt; +# - Kevin Fenzi <kevin(a)tummy.com&gt; %include fedora-live-base.ks commit 06351dfefb0e2a6fecccbf040699a9959a4efc1f Author: Rahul Sundaram <sundaram(a)sundaram.pnq.redhat.com&gt; Date: Thu Sep 25 16:43:02 2008 +0530 Added NetworkManager-pptp and asunder, replace mirage with ristretto and xscreensaver with gnome-screensaver. Some additional cleanup as well diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 7e7e0e5..f45c750 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -13,6 +13,7 @@ firefox NetworkManager-vpnc NetworkManager-openvpn NetworkManager-gnome +NetworkManager-pptp # we don't include @office so that we don't get OOo. but some nice bits @@ -24,7 +25,7 @@ gimp inkscape galculator desktop-backgrounds-compat -xscreensaver-base +gnome-screensaver setroubleshoot # development @@ -34,7 +35,6 @@ geany xdg-user-dirs @java totem --totem-xine totem-mozplugin pidgin claws-mail @@ -44,7 +44,8 @@ drivel liferea quodlibet gftp -mirage +ristretto +asunder tracker-search-tool gnome-power-manager @@ -62,6 +63,7 @@ wget irssi mutt yum-utils +ssmtp # xfce packages @xfce-desktop @@ -101,30 +103,6 @@ xfwm4-themes -man-pages-* -scim-tables-* -fonts-ISO8859-2 -cjkunifonts-ukai -madan-fonts -fonts-KOI8-R -fonts-KOI8-R-100dpi -tibetan-machine-uni-fonts - - -#-wqy-bitmap-fonts -#-dejavu-fonts-experimental -#-dejavu-fonts - -# drop more fonts -#-lohit-fonts-* -#-thaifonts-scalable -#-paktype-fonts -#-VLGothic-fonts -#-baekmuk-ttf-fonts-* -#-kacst-fonts -#-lklug-fonts -#-jomolhari-fonts -#-abyssinica-fonts -#-cjkunifonts-uming -# # more fun with space saving -scim-lang-chinese scim-chewing