Having a fedora-livedvd-kde.ks makes no sense as all it does is include localization

Adjusted other kickstarts for consistency

13 files changed, 24 insertions, 133 deletions

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 781fb76..51a1e3d 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -1,10 +1,11 @@
 # fedora-live-base.ks
 #
-# Version independent kickstart configuration
+# Version independent kickstart configuration for Fedora Live Media
+#
 # Defines the basics for all kickstarts in the fedora-live branch
 # Does not include package selection (other then mandatory)
 # Does not include localization packages or configuration
-
+#
 # Does includes "default" language configuration (kickstarts including
 # this template can override these settings)
 
diff --git a/fedora-livecd-desktop-default.ks b/fedora-livecd-desktop-default.ks
index 37f745a..6fb85f3 100644
--- a/fedora-livecd-desktop-default.ks
+++ b/fedora-livecd-desktop-default.ks
@@ -1,4 +1,7 @@
-# fedora-live-desktop-en.ks
+# fedora-livecd-desktop-default.ks
+#
+# Includes all languages with a default of en_US locale settings
+#
 
 %include fedora-livecd-desktop.ks
 
diff --git a/fedora-livecd-desktop-en_US.ks b/fedora-livecd-desktop-en_US.ks
index 8c70d4d..33670de 100644
--- a/fedora-livecd-desktop-en_US.ks
+++ b/fedora-livecd-desktop-en_US.ks
@@ -1,4 +1,4 @@
-# fedora-live-desktop-en_US.ks
+# fedora-livecd-desktop-en_US.ks
 #
 # Maintainer(s):
 # - UNKNOWN
diff --git a/fedora-livecd-desktop-nl_NL.ks b/fedora-livecd-desktop-nl_NL.ks
index a75b724..7c53041 100644
--- a/fedora-livecd-desktop-nl_NL.ks
+++ b/fedora-livecd-desktop-nl_NL.ks
@@ -1,4 +1,4 @@
-# fedora-live-desktop-nl_NL.ks
+# fedora-livecd-desktop-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
diff --git a/fedora-livecd-electronic-lab-nl_NL.ks b/fedora-livecd-electronic-lab-nl_NL.ks
index 8435631..c623ca5 100644
--- a/fedora-livecd-electronic-lab-nl_NL.ks
+++ b/fedora-livecd-electronic-lab-nl_NL.ks
@@ -1,9 +1,9 @@
-# fedora-live-electronic-lab-nl_NL.ks
+# fedora-livecd-electronic-lab-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include fedora-live-electronic-lab.ks
+%include fedora-livecd-electronic-lab.ks
 
 lang nl_NL
 keyboard us
@@ -11,4 +11,4 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
-%end
\ No newline at end of file
+%end
diff --git a/fedora-livecd-kde-nl_NL.ks b/fedora-livecd-kde-nl_NL.ks
index cd6221c..68e57f8 100644
--- a/fedora-livecd-kde-nl_NL.ks
+++ b/fedora-livecd-kde-nl_NL.ks
@@ -1,4 +1,4 @@
-# fedora-live-kde-nl_NL.ks
+# fedora-livecd-kde-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
@@ -11,4 +11,4 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
-%end
\ No newline at end of file
+%end
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index eae5d7b..552cbdb 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,4 +1,4 @@
-%include livecd-fedora-base-desktop.ks
+%include fedora-live-base.ks
 
 %packages
 @kde-desktop
@@ -41,7 +41,7 @@ fonts-KOI8-R-100dpi
 tibetan-machine-uni-fonts
 
 # FIXME/TODO: recheck the removals here
-# try to remove some packages from livecd-fedora-base-desktop.ks
+# try to remove some packages from fedora-live-base.ks
 -gdm
 -authconfig-gtk
 
diff --git a/fedora-livecd-xfce-nl_NL.ks b/fedora-livecd-xfce-nl_NL.ks
index 73df885..ec9a92f 100644
--- a/fedora-livecd-xfce-nl_NL.ks
+++ b/fedora-livecd-xfce-nl_NL.ks
@@ -1,9 +1,9 @@
-# fedora-live-xfce-nl_NL.ks
+# fedora-livecd-xfce-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include fedora-live-xfce.ks
+%include fedora-livecd-xfce.ks
 
 lang nl_NL
 keyboard us
@@ -11,4 +11,4 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
-%end
\ No newline at end of file
+%end
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index e884567..235e720 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -1,4 +1,4 @@
-# fedora-live-xfce.ks
+# fedora-livecd-xfce.ks
 #
 # Description:
 # - Fedora Live Spin with the light-weight XFCE Desktop Environment
diff --git a/fedora-livedvd-developer-nl_NL.ks b/fedora-livedvd-developer-nl_NL.ks
index 71caa48..cd91c26 100644
--- a/fedora-livedvd-developer-nl_NL.ks
+++ b/fedora-livedvd-developer-nl_NL.ks
@@ -1,4 +1,4 @@
-# fedora-live-developer-nl_NL.ks
+# fedora-livedvd-developer-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
@@ -11,4 +11,4 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
-%end
\ No newline at end of file
+%end
diff --git a/fedora-livedvd-games-nl_NL.ks b/fedora-livedvd-games-nl_NL.ks
index b415c64..258a5da 100644
--- a/fedora-livedvd-games-nl_NL.ks
+++ b/fedora-livedvd-games-nl_NL.ks
@@ -1,4 +1,4 @@
-# fedora-live-games-nl_NL.ks
+# fedora-livedvd-games-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks
index 49ceb73..ead4693 100644
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@@ -1,11 +1,7 @@
 %include fedora-live-base.ks
 part / --size 8000
 
-# customize repo configuration for local builds
-# repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-
-
-%packages --ignoremissing
+%packages
 
 # games
 
diff --git a/fedora-livedvd-kde.ks b/fedora-livedvd-kde.ks
deleted file mode 100644
index 956cc4d..0000000
--- a/fedora-livedvd-kde.ks
+++ /dev/null
@@ -1,109 +0,0 @@
-%include livecd-fedora-kde.ks
-
-%packages
-
-# add full language support
-@afrikaans-support
-@albanian-support
-@arabic-support
-@armenian-support
-@assamese-support
-@basque-support
-@belarusian-support
-@bengali-support
-@bhutanese-support
-@bosnian-support
-@brazilian-support
-@breton-support
-@british-support
-@bulgarian-support
-@catalan-support
-@chinese-support
-@croatian-support
-@czech-support
-@danish-support
-@dutch-support
-@estonian-support
-@ethiopic-support
-@faeroese-support
-@filipino-support
-@finnish-support
-@french-support
-@gaelic-support
-@galician-support
-@georgian-support
-@german-support
-@greek-support
-@gujarati-support
-@hebrew-support
-@hindi-support
-@hungarian-support
-@icelandic-support
-@indonesian-support
-@inuktitut-support
-@irish-support
-@italian-support
-@japanese-support
-@kannada-support
-@khmer-support
-@korean-support
-@lao-support
-@latvian-support
-@lithuanian-support
-@malay-support
-@malayalam-support
-@maori-support
-@marathi-support
-@northern-sotho-support
-@norwegian-support
-@oriya-support
-@persian-support
-@polish-support
-@portuguese-support
-@punjabi-support
-@romanian-support
-@russian-support
-@samoan-support
-@serbian-support
-@sinhala-support
-@slovak-support
-@slovenian-support
-@somali-support
-@southern-ndebele-support
-@southern-sotho-support
-@spanish-support
-@swati-support
-@swedish-support
-@tagalog-support
-@tamil-support
-@telugu-support
-@thai-support
-@tibetan-support
-@tonga-support
-@tsonga-support
-@tswana-support
-@turkish-support
-@ukrainian-support
-@urdu-support
-@venda-support
-@vietnamese-support
-@welsh-support
-@xhosa-support
-@zulu-support
-
-# and some extra packages
-koffice-*
-
-%end
-
-%post
-
-# Use gdm here for language selection
-
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-#DISPLAYMANAGER="KDE"
-EOF
-
-%end