From 825cef77c596f1e9612abcf40ddd85fde57f42e0 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 12 Dec 2011 12:11:53 +0100
Subject: [PATCH] anaconda, repos: Use same group selection in all places

---
 anaconda/installclasses/qubes.py | 7 ++++---
 yum/update_repo.sh               | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/anaconda/installclasses/qubes.py b/anaconda/installclasses/qubes.py
index ae06d96..b158486 100644
--- a/anaconda/installclasses/qubes.py
+++ b/anaconda/installclasses/qubes.py
@@ -48,7 +48,7 @@ class InstallClass(BaseInstallClass):
 
     bootloaderTimeoutDefault = 5
 
-    tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop", "qubes" ]) ]
+    tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop-qubes", "qubes" ]) ]
 
     bugFiler = BugzillaFiler("http://qubes-os.org/trac/",
                              "http://qubes-os.org/",
@@ -67,8 +67,9 @@ class InstallClass(BaseInstallClass):
                                                 anaconda.platform)
 
     def setGroupSelection(self, anaconda):
-        BaseInstallClass.setGroupSelection(self, anaconda)
-        map(lambda x: anaconda.backend.selectGroup(x), ["base"])
+        #BaseInstallClass.setGroupSelection(self, anaconda)
+        anaconda.backend.resetPackageSelections()
+        map(lambda x: anaconda.backend.selectGroup(x), ["base", "base-x", "kde-desktop-qubes", "qubes"])
 
     def setSteps(self, anaconda):
         BaseInstallClass.setSteps(self, anaconda)
diff --git a/yum/update_repo.sh b/yum/update_repo.sh
index c064e6c..0ace108 100755
--- a/yum/update_repo.sh
+++ b/yum/update_repo.sh
@@ -17,7 +17,7 @@ check_repo()
 
 update_repo()
 {
-    createrepo --update $1
+    createrepo -g ../../conf/comps-qubes.xml --update $1
 }