From ad801d9d4ce6bf65fd0d0223273833629750ca12 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Tue, 16 Sep 2008 20:56:56 +0100 Subject: [PATCH 1/5] Change pt-latin1 to pt in xorg.conf hack on gnome based livecd and livedvd. --- fedora-livecd-desktop-pt_PT.ks | 24 ++++++++++++------------ fedora-livedvd-developer-pt_PT.ks | 4 ++-- fedora-livedvd-games-pt_PT.ks | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fedora-livecd-desktop-pt_PT.ks b/fedora-livecd-desktop-pt_PT.ks index b3be353..78fe1d8 100644 --- a/fedora-livecd-desktop-pt_PT.ks +++ b/fedora-livecd-desktop-pt_PT.ks @@ -11,15 +11,15 @@ timezone Europe/Lisbon %packages @portuguese-support -%end - -%post -# system-config-keyboard doesn't really work (missing xorg.conf etc) -cat >>/etc/X11/xorg.conf << EOF -Section "InputDevice" - Identifier "Keyboard0" - Driver "kbd" - Option "XkbLayout" "pt-latin1" -EndSection -EOF -%end +%end + +%post +# system-config-keyboard doesn't really work (missing xorg.conf etc) +cat >>/etc/X11/xorg.conf << EOF +Section "InputDevice" + Identifier "Keyboard0" + Driver "kbd" + Option "XkbLayout" "pt" +EndSection +EOF +%end diff --git a/fedora-livedvd-developer-pt_PT.ks b/fedora-livedvd-developer-pt_PT.ks index 0775470..b217800 100644 --- a/fedora-livedvd-developer-pt_PT.ks +++ b/fedora-livedvd-developer-pt_PT.ks @@ -19,7 +19,7 @@ cat >>/etc/X11/xorg.conf << EOF Section "InputDevice" Identifier "Keyboard0" Driver "kbd" - Option "XkbLayout" "pt-latin1" + Option "XkbLayout" "pt" EndSection EOF -%end \ No newline at end of file +%end diff --git a/fedora-livedvd-games-pt_PT.ks b/fedora-livedvd-games-pt_PT.ks index d623cab..7a385a5 100644 --- a/fedora-livedvd-games-pt_PT.ks +++ b/fedora-livedvd-games-pt_PT.ks @@ -19,7 +19,7 @@ cat >>/etc/X11/xorg.conf << EOF Section "InputDevice" Identifier "Keyboard0" Driver "kbd" - Option "XkbLayout" "pt-latin1" + Option "XkbLayout" "pt" EndSection EOF -%end \ No newline at end of file +%end From 42093d04c6dbf2595f91fb5b179df34a0d0f6bc9 Mon Sep 17 00:00:00 2001 From: Chitlesh Goorah Date: Sun, 21 Sep 2008 10:57:39 +0200 Subject: [PATCH 2/5] set part to 8192 --- fedora-livedvd-electronic-lab.ks | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks index 7a43065..59e9773 100644 --- a/fedora-livedvd-electronic-lab.ks +++ b/fedora-livedvd-electronic-lab.ks @@ -7,6 +7,9 @@ %include fedora-livecd-kde.ks +# DVD payload +part / --size=8192 + %packages # KDE basic packages @@ -58,7 +61,6 @@ gnome-bluetooth # ignore comps.xml and make sure these packages are included -rhgb make # include default fedora wallpaper desktop-backgrounds-basic From cfa07568c846798a32f5cd22258721e97aaad781 Mon Sep 17 00:00:00 2001 From: Sebastian Vahl Date: Wed, 24 Sep 2008 12:05:22 +0200 Subject: [PATCH 3/5] make sure that phonon-backend-xine is on the beta; remove pavucontrol for saving space --- fedora-livecd-kde.ks | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 1ca9eef..38d1131 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -11,12 +11,15 @@ %packages +# workaround to put it on the beta +phonon-backend-xine + @kde-desktop # unwanted packages from @kde-desktop # don't include these for now to fit on a cd -### amarok has duplicate functionality with juk (~14 megs) +### amarok has duplicate functionality with juk (~10 megs) #-amarok ### digikam has duplicate functionality with gwenview (~11 megs) -digikam @@ -47,7 +50,8 @@ filelight # some extras fuse -pavucontrol +# nice to have but pulls in gstreamer +#pavucontrol # additional fonts From 601a68b97b052bf33352d80d74b3cd83771043d9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 24 Sep 2008 12:52:43 -0400 Subject: [PATCH 4/5] Add maintainership link, remove sendmail,autofs,gnome-games-help --- fedora-livecd-desktop.ks | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 371ad17..a4d3c64 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -1,3 +1,7 @@ +# Maintained by the Fedora Desktop SIG: +# http://fedoraproject.org/wiki/SIGs/Desktop +# mailto:fedora-desktop-list@redhat.com + %include fedora-live-base.ks %packages @@ -33,11 +37,16 @@ festvox-slt-arctic-hts scim-chewing scim-pinyin +# These two are "traditional Unix workstation" tools - if you want them, +# you can install them separately. +-sendmail +-autofs + # save some space -gnome-user-docs -gimp-help -evolution-help --autofs +-gnome-games-help -nss_db -vino From cd5fed207919194f041e31e82f65293d173f77b5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 24 Sep 2008 18:31:50 -0400 Subject: [PATCH 5/5] Use ssmtp instead of sendmail --- fedora-livecd-desktop.ks | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index a4d3c64..65ffec6 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -37,10 +37,11 @@ festvox-slt-arctic-hts scim-chewing scim-pinyin -# These two are "traditional Unix workstation" tools - if you want them, -# you can install them separately. +# Sendmail has slow startup and is in general not necessary - +# long term we should evaluate dropping local SMTP entirely +# and fix cron -sendmail --autofs +ssmtp # save some space -gnome-user-docs