From 769f598f7230c11efe1a5c3423dc981a70a3edad Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Fri, 19 Sep 2008 14:13:41 +0200 Subject: [PATCH 1/6] Remove --ignoremissing from %packages --- fedora-livedvd-developer.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livedvd-developer.ks b/fedora-livedvd-developer.ks index 60ff68a..deff919 100644 --- a/fedora-livedvd-developer.ks +++ b/fedora-livedvd-developer.ks @@ -2,7 +2,7 @@ part / --size 6000 -%packages --ignoremissing +%packages # Libraries @development-libs @gnome-software-development From d4518e827d02119339c2bc5bf7855c49e372a213 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 25 Sep 2008 16:43:02 +0530 Subject: [PATCH 2/6] Added NetworkManager-pptp and asunder, replace mirage with ristretto and xscreensaver with gnome-screensaver. Some additional cleanup as well --- fedora-livecd-xfce.ks | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) 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 From 183f1575f1ae497782c5173c198516597e71609d Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 25 Sep 2008 16:45:23 +0530 Subject: [PATCH 3/6] add other xfce sig members as maintainers --- fedora-livecd-xfce.ks | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 +# - Rahul Sundaram +# - Christoph Wickert +# - Kevin Fenzi %include fedora-live-base.ks From 4e6210e55571bd3961044f942e8cbb8e42fdc3bf Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 25 Sep 2008 17:00:25 +0530 Subject: [PATCH 4/6] match desktop ks file settings --- fedora-livecd-xfce.ks | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) 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_ +TimedLoginDelay=60 +FOE -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 EOF + + %end From 7c03fda0d30f6be21faf2d31f7a3d5e083daf5da Mon Sep 17 00:00:00 2001 From: root Date: Thu, 25 Sep 2008 21:51:08 +0530 Subject: [PATCH 5/6] include gnome-session --- fedora-livecd-xfce.ks | 5 +++++ 1 file changed, 5 insertions(+) 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 From a92a207649ce13abb641469903fa1c94ed38e540 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 25 Sep 2008 23:49:47 +0530 Subject: [PATCH 6/6] gnome session hack --- fedora-livecd-xfce.ks | 6 ++++++ 1 file changed, 6 insertions(+) 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