move utilities packages to pacstrap-base

5 files changed, 14 insertions, 12 deletions

diff --git a/src/libcalamares/PacstrapCppJob.cpp b/src/libcalamares/PacstrapCppJob.cpp
index ae90093fc..e9d5f7658 100644
--- a/src/libcalamares/PacstrapCppJob.cpp
+++ b/src/libcalamares/PacstrapCppJob.cpp
@@ -29,13 +29,13 @@
 
 const QString PacstrapCppJob::BOOTLODER_PACKAGES_KEY    = "bootloader" ;
 const QString PacstrapCppJob::KERNEL_PACKAGES_KEY       = "kernel" ;
+const QString PacstrapCppJob::UTILITIES_PACKAGES_KEY    = "utilities" ;
 const QString PacstrapCppJob::OPENRC_PACKAGES_KEY       = "openrc" ;
 const QString PacstrapCppJob::SYSTEMD_PACKAGES_KEY      = "systemd" ;
 const QString PacstrapCppJob::APPLICATIONS_PACKAGES_KEY = "applications" ;
 const QString PacstrapCppJob::MULTIMEDIA_PACKAGES_KEY   = "multimedia" ;
 const QString PacstrapCppJob::NETWORK_PACKAGES_KEY      = "network" ;
 const QString PacstrapCppJob::LOOKANDFEEL_PACKAGES_KEY  = "look-and-feel" ;
-const QString PacstrapCppJob::UTILITIES_PACKAGES_KEY    = "utilities" ;
 const QString PacstrapCppJob::XSERVER_PACKAGES_KEY      = "x-server" ;
 const QString PacstrapCppJob::LXDE_PACKAGES_KEY         = "lxde" ;
 const QString PacstrapCppJob::MATE_PACKAGES_KEY         = "mate" ;
diff --git a/src/libcalamares/PacstrapCppJob.h b/src/libcalamares/PacstrapCppJob.h
index 7934d8c89..6b431e03b 100644
--- a/src/libcalamares/PacstrapCppJob.h
+++ b/src/libcalamares/PacstrapCppJob.h
@@ -78,9 +78,9 @@ protected:
 
 private:
 
-  static        QString              FindTargetDevice  (const QVariantList& partitions) ;
-  static inline Calamares::JobResult JobError          (QString error_msg) ;
-  static inline Calamares::JobResult JobSuccess        () ;
+  static        QString              FindTargetDevice(const QVariantList& partitions) ;
+  static inline Calamares::JobResult JobError        (QString error_msg) ;
+  static inline Calamares::JobResult JobSuccess      () ;
 
   qint16 nPackagesInstalled() ;
   qreal  emitProgress      (qreal transient_percent) ;
@@ -93,13 +93,13 @@ public:
 
   static const QString BOOTLODER_PACKAGES_KEY ;
   static const QString KERNEL_PACKAGES_KEY ;
+  static const QString UTILITIES_PACKAGES_KEY ;
   static const QString OPENRC_PACKAGES_KEY ;
   static const QString SYSTEMD_PACKAGES_KEY ;
   static const QString APPLICATIONS_PACKAGES_KEY ;
   static const QString MULTIMEDIA_PACKAGES_KEY ;
   static const QString NETWORK_PACKAGES_KEY ;
   static const QString LOOKANDFEEL_PACKAGES_KEY ;
-  static const QString UTILITIES_PACKAGES_KEY ;
   static const QString XSERVER_PACKAGES_KEY ;
   static const QString LXDE_PACKAGES_KEY ;
   static const QString MATE_PACKAGES_KEY ;
diff --git a/src/modules/pacstrap-base/pacstrap-base.conf b/src/modules/pacstrap-base/pacstrap-base.conf
index af1b54c65..06f2d610e 100644
--- a/src/modules/pacstrap-base/pacstrap-base.conf
+++ b/src/modules/pacstrap-base/pacstrap-base.conf
@@ -8,6 +8,14 @@ bootloader:
 kernel:
   - "linux-libre"
 
+utilities:
+  - "bash-completion"
+  - "p7zip"
+  - "sudo"
+  - "unar"
+  - "unzip"
+  - "zip"
+
 
 ### Init System ###
 
diff --git a/src/modules/pacstrap-base/pacstrap-base.cpp b/src/modules/pacstrap-base/pacstrap-base.cpp
index 1c8d714d7..4b4f2cb76 100644
--- a/src/modules/pacstrap-base/pacstrap-base.cpp
+++ b/src/modules/pacstrap-base/pacstrap-base.cpp
@@ -46,6 +46,7 @@ QString PacstrapBaseJob::getPackageList()
 
   return (this->localStorage.value(BOOTLODER_PACKAGES_KEY).toStringList() +
           this->localStorage.value(KERNEL_PACKAGES_KEY   ).toStringList() +
+          this->localStorage.value(UTILITIES_PACKAGES_KEY).toStringList() +
           this->localStorage.value(init_key              ).toStringList() ).join(' ') ;
 }
 
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.conf b/src/modules/pacstrap-gui/pacstrap-gui.conf
index 78fc5c2dc..07f1f98da 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.conf
+++ b/src/modules/pacstrap-gui/pacstrap-gui.conf
@@ -32,15 +32,8 @@ look-and-feel:
   - "xdg-user-dirs"
 
 utilities:
-  - "bash-completion"
   - "dmidecode"
   - "gvfs"
-  - "p7zip"
-  - "sudo"
-  - "unar"
-  - "unzip"
-  - "zenity"
-  - "zip"
 
 x-server:
   - "ttf-dejavu"