squashme - housekeeping

8 files changed, 14 insertions, 12 deletions

diff --git a/src/libcalamares/PacstrapCppJob.cpp b/src/libcalamares/PacstrapCppJob.cpp
index 8f97114da..9f991fecc 100644
--- a/src/libcalamares/PacstrapCppJob.cpp
+++ b/src/libcalamares/PacstrapCppJob.cpp
@@ -89,7 +89,6 @@ const QString PacstrapCppJob::KEYRING_CMD              = "pacman -Sy --noconfirm
                                                                                  archlinux32-keyring     \
                                                                                  archlinuxarm-keyring    \
                                                                                  parabola-keyring     && \
-                                                          rm -rf /etc/pacman.d/gnupg/                 && \
                                                           pacman-key --init                           && \
                                                           pacman-key --populate archlinux                \
                                                                                 archlinux32              \
@@ -168,6 +167,7 @@ globalStorage->insert(GS::DESKTOP_KEY    , LXDE_PACKAGES_KEY   ) ; // TODO: per
   bool         is_online   = this->globalStorage->value(GS::IS_ONLINE_KEY      ).toBool() ;
   this->mountPoint         = this->globalStorage->value(GS::ROOT_MOUNTPOINT_KEY).toString() ;
   this->targetDevice       = FindTargetDevice(partitions) ;
+is_online = false ; // TODO: per user option via globalStorage
   this->confFile           = (!has_isorepo) ? DEFAULT_CONF_FILENAME :
                              (is_online   ) ? ONLINE_CONF_FILENAME  : OFFLINE_CONF_FILENAME ;
   this->packages           = getPackageList() ;
@@ -194,7 +194,8 @@ DEBUG_TRACE_EXEC
   if (!!execStatus(chroot_prep_cmd                         )) return JobError(CHROOT_PREP_ERROR_MSG) ;
   if (!!execStatus(pacman_sync_cmd , PACMAN_SYNC_PROPORTION)) return JobError(PACMAN_SYNC_ERROR_MSG) ;
 
-execStatus(QString("touch %1/etc/os-release").arg(this->mountPoint)) ; //FIXME:
+printf("[PACSTRAP-JOB]: FIXME: this->mountPoint/etc/os-release: %s\n" , execOutput(QString("ls -l %1/etc/os-release").arg(this->mountPoint))) ; // FIXME:
+execStatus(QString("touch %1/etc/os-release").arg(this->mountPoint)) ; // FIXME:
 
   if (!this->packages.isEmpty())
   {
@@ -227,7 +228,7 @@ execStatus(QString("touch %1/etc/os-release").arg(this->mountPoint)) ; //FIXME:
       }
       if (!!pacstrap_status) return JobError(PACSTRAP_ERROR_MSG + pacstrap_error) ;
 
-      QString exec_error_msg = chrootExec() ;
+      QString exec_error_msg = chrootExecPostInstall() ;
 
       if (exec_error_msg.isEmpty()) this->nPendingPackages = 0 ;
       else                          return JobError(exec_error_msg) ;
diff --git a/src/libcalamares/PacstrapCppJob.h b/src/libcalamares/PacstrapCppJob.h
index 7f5092b13..69a5924a8 100644
--- a/src/libcalamares/PacstrapCppJob.h
+++ b/src/libcalamares/PacstrapCppJob.h
@@ -57,8 +57,8 @@ protected:
   QString     execOutput      (QString command_line , qreal task_proportion = 0.0) ;
   QString     execError       (QString command_line , qreal task_proportion = 0.0) ;
 
-  virtual QString getPackageList() = 0 ;
-  virtual QString chrootExec    () = 0 ;
+  virtual QString getPackageList       () = 0 ;
+  virtual QString chrootExecPostInstall() = 0 ;
 
   QString                   jobName ;
   QString                   statusMsg ;
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 8289df602..54178e7a9 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -121,7 +121,7 @@ UIDLLEXPORT QSize defaultIconSize();
  * @brief Size constants for the main Calamares window.
  */
 constexpr int windowMinimumWidth = 800;
-constexpr int windowMinimumHeight = 520;
+constexpr int windowMinimumHeight = 530;
 constexpr int windowPreferredWidth = 1024;
 constexpr int windowPreferredHeight = 530;
 }
diff --git a/src/modules/pacstrap-base/pacstrap-base.cpp b/src/modules/pacstrap-base/pacstrap-base.cpp
index 4b4f2cb76..5ad6b41f4 100644
--- a/src/modules/pacstrap-base/pacstrap-base.cpp
+++ b/src/modules/pacstrap-base/pacstrap-base.cpp
@@ -53,7 +53,7 @@ QString PacstrapBaseJob::getPackageList()
 
 /* PacstrapBaseJob protected instance methods */
 
-QString PacstrapBaseJob::chrootExec()
+QString PacstrapBaseJob::chrootExecPostInstall()
 {
 //   QString grub_crypto_cmd = GRUB_CRYPTO_FMT.arg(this->mountPoint) ;
   QString grub_theme_cmd  = GRUB_THEME_FMT .arg(this->mountPoint) ;
diff --git a/src/modules/pacstrap-base/pacstrap-base.h b/src/modules/pacstrap-base/pacstrap-base.h
index 81504d00b..01b363a4e 100644
--- a/src/modules/pacstrap-base/pacstrap-base.h
+++ b/src/modules/pacstrap-base/pacstrap-base.h
@@ -36,8 +36,8 @@ public:
 
 protected:
 
-  QString getPackageList() override ;
-  QString chrootExec    () override ;
+  QString getPackageList       () override ;
+  QString chrootExecPostInstall() override ;
 
 
 private:
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.conf b/src/modules/pacstrap-gui/pacstrap-gui.conf
index afedfb443..8e71031b2 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.conf
+++ b/src/modules/pacstrap-gui/pacstrap-gui.conf
@@ -75,6 +75,7 @@ lxde:
   - "gksu"
   - "gnome-screenshot"
   - "lxde"
+  - "lxdm" # (issue #1790)
   - "obconf"
   - "xarchiver"
   - "xscreensaver"
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.cpp b/src/modules/pacstrap-gui/pacstrap-gui.cpp
index b70093918..48964b1af 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.cpp
+++ b/src/modules/pacstrap-gui/pacstrap-gui.cpp
@@ -76,7 +76,7 @@ DEBUG_TRACE_DESKTOPPACKAGES
 
 /* PacstrapGuiJob protected instance methods */
 
-QString PacstrapGuiJob::chrootExec()
+QString PacstrapGuiJob::chrootExecPostInstall()
 {
 //   QString wallpaper_cmd     = WALLPAPER_FMT.arg(MOUNTPOINT) ;
   QString default_desktop   = this->globalStorage->value(GS::DESKTOP_KEY).toString() ;
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.h b/src/modules/pacstrap-gui/pacstrap-gui.h
index 798b50f1e..7a360f43b 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.h
+++ b/src/modules/pacstrap-gui/pacstrap-gui.h
@@ -36,8 +36,8 @@ public:
 
 protected:
 
-  QString getPackageList() override ;
-  QString chrootExec    () override ;
+  QString getPackageList       () override ;
+  QString chrootExecPostInstall() override ;
 
 
 private: