squashme - housekeeping

6 files changed, 10 insertions, 3 deletions

diff --git a/src/libcalamares/PacstrapCppJob.cpp b/src/libcalamares/PacstrapCppJob.cpp
index 9f991fecc..8fd0ecdd1 100644
--- a/src/libcalamares/PacstrapCppJob.cpp
+++ b/src/libcalamares/PacstrapCppJob.cpp
@@ -194,9 +194,6 @@ 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) ;
 
-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())
   {
     QVariantMap result       = execWithProgress(list_packages_cmd , LIST_PACKAGES_PROPORTION) ;
diff --git a/src/libcalamares/PacstrapCppJob.h b/src/libcalamares/PacstrapCppJob.h
index 69a5924a8..8fc6b3aa0 100644
--- a/src/libcalamares/PacstrapCppJob.h
+++ b/src/libcalamares/PacstrapCppJob.h
@@ -58,6 +58,7 @@ protected:
   QString     execError       (QString command_line , qreal task_proportion = 0.0) ;
 
   virtual QString getPackageList       () = 0 ;
+  virtual QString chrootExecPreInstall () = 0 ;
   virtual QString chrootExecPostInstall() = 0 ;
 
   QString                   jobName ;
diff --git a/src/modules/pacstrap-base/pacstrap-base.cpp b/src/modules/pacstrap-base/pacstrap-base.cpp
index 5ad6b41f4..92dd09f52 100644
--- a/src/modules/pacstrap-base/pacstrap-base.cpp
+++ b/src/modules/pacstrap-base/pacstrap-base.cpp
@@ -53,6 +53,8 @@ QString PacstrapBaseJob::getPackageList()
 
 /* PacstrapBaseJob protected instance methods */
 
+QString PacstrapBaseJob::chrootExecPreInstall() {}
+
 QString PacstrapBaseJob::chrootExecPostInstall()
 {
 //   QString grub_crypto_cmd = GRUB_CRYPTO_FMT.arg(this->mountPoint) ;
@@ -61,6 +63,9 @@ QString PacstrapBaseJob::chrootExecPostInstall()
 //   if (!!execStatus(grub_crypto_cmd)) return GRUB_CRYPTO_ERROR_MSG ;
   if (!!execStatus(grub_theme_cmd )) return GRUB_THEME_ERROR_MSG ;
 
+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:
+
   return QString("") ;
 }
 
diff --git a/src/modules/pacstrap-base/pacstrap-base.h b/src/modules/pacstrap-base/pacstrap-base.h
index 01b363a4e..39fee2b84 100644
--- a/src/modules/pacstrap-base/pacstrap-base.h
+++ b/src/modules/pacstrap-base/pacstrap-base.h
@@ -37,6 +37,7 @@ public:
 protected:
 
   QString getPackageList       () override ;
+  QString chrootExecPreInstall () override ;
   QString chrootExecPostInstall() override ;
 
 
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.cpp b/src/modules/pacstrap-gui/pacstrap-gui.cpp
index 48964b1af..67a46f694 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.cpp
+++ b/src/modules/pacstrap-gui/pacstrap-gui.cpp
@@ -76,6 +76,8 @@ DEBUG_TRACE_DESKTOPPACKAGES
 
 /* PacstrapGuiJob protected instance methods */
 
+QString PacstrapGuiJob::chrootExecPreInstall() {}
+
 QString PacstrapGuiJob::chrootExecPostInstall()
 {
 //   QString wallpaper_cmd     = WALLPAPER_FMT.arg(MOUNTPOINT) ;
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.h b/src/modules/pacstrap-gui/pacstrap-gui.h
index 7a360f43b..2959968a5 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.h
+++ b/src/modules/pacstrap-gui/pacstrap-gui.h
@@ -37,6 +37,7 @@ public:
 protected:
 
   QString getPackageList       () override ;
+  QString chrootExecPreInstall () override ;
   QString chrootExecPostInstall() override ;