Merge pull request #18 from calamares/master

Update #3

Author: noMA-4

CHANGES

@@ -6,7 +6,8 @@ website will have to do for older versions.
 # 3.2.21 (unreleased) #
 
 This release contains contributions from (alphabetically by first name):
- - No external contributors yet
+ - Camilo Higuita
+ - Gabriel Craciunescu
 
 ## Core ##
  - Python job modules (such as *unpackfs* or *packages*) can now provide

CMakeLists.txt

@@ -135,10 +135,11 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" )
 if( POLICY CMP0057 )
     cmake_policy( SET CMP0057 NEW )
 endif()
-# CMake 3.9, 3.10 compatibility
+# Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files.
 if( POLICY CMP0071 )
     cmake_policy( SET CMP0071 NEW )
 endif()
+# Recognize more macros to trigger automoc
 if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
     list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
         "K_PLUGIN_FACTORY_WITH_JSON"

src/calamares/CalamaresWindow.cpp

@@ -136,6 +136,8 @@ CalamaresWindow::getQmlSidebar( int desiredWidth )
 {
     CalamaresUtils::registerCalamaresModels();
     QQuickWidget* w = new QQuickWidget( this );
+    w->setFixedWidth( desiredWidth );
+    w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
     w->setSource( QUrl(
         CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) );
     return w;
@@ -197,7 +199,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
         sideBox = getQmlSidebar(
             qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
         break;
-    default:
+    case Calamares::Branding::SidebarFlavor::None:
         sideBox = nullptr;
     }
     if ( sideBox )

src/libcalamaresui/viewpages/QmlViewStep.cpp

@@ -232,7 +232,7 @@ QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         QObject* config = this->getConfig();
         if ( config )
         {
-            m_qmlWidget->engine()->rootContext()->setContextProperty( "config", config );
+            setContextProperty( "config", config );
         }
 
         cDebug() << "QmlViewStep" << moduleInstanceKey() << "loading" << m_qmlFileName;
@@ -267,4 +267,10 @@ QmlViewStep::getConfig()
     return nullptr;
 }
 
+void
+QmlViewStep::setContextProperty( const char* name, QObject* property )
+{
+    m_qmlWidget->engine()->rootContext()->setContextProperty( name, property );
+}
+
 }  // namespace Calamares

src/libcalamaresui/viewpages/QmlViewStep.h

@@ -85,6 +85,12 @@ class QmlViewStep : public Calamares::ViewStep
      */
     virtual QObject* getConfig();
 
+    /** @brief Adds a context property for this QML file
+     *
+     * Does not take ownership.
+     */
+    void setContextProperty( const char* name, QObject* property );
+
 private Q_SLOTS:
     void loadComplete();
 

src/modules/bootloader/main.py

@@ -117,25 +117,29 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
 
     partitions = libcalamares.globalstorage.value("partitions")
     swap_uuid = ""
+    swap_outer_mappername = None
 
     cryptdevice_params = []
 
     # Take over swap settings:
     #  - unencrypted swap partition sets swap_uuid
     #  - encrypted root sets cryptdevice_params
     for partition in partitions:
+        if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
+            continue
         has_luks = "luksMapperName" in partition
         if partition["fs"] == "linuxswap" and not has_luks:
             swap_uuid = partition["uuid"]
 
+        if (partition["fs"] == "linuxswap" and has_luks):
+            swap_outer_mappername = partition["luksMapperName"]
+
         if partition["mountPoint"] == "/" and has_luks:
             cryptdevice_params = ["cryptdevice=UUID="
                                   + partition["luksUuid"]
                                   + ":"
                                   + partition["luksMapperName"],
                                   "root=/dev/mapper/"
-                                  + partition["luksMapperName"],
-                                  "resume=/dev/mapper/"
                                   + partition["luksMapperName"]]
 
     if cryptdevice_params:
@@ -146,6 +150,10 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
     if swap_uuid:
         kernel_params.append("resume=UUID={!s}".format(swap_uuid))
 
+    if swap_outer_mappername:
+        kernel_params.append("resume=/dev/mapper/{!s}".format(
+            swap_outer_mappername))
+
     kernel_line = get_kernel_line(kernel_type)
     libcalamares.utils.debug("Configure: \"{!s}\"".format(kernel_line))
 

src/modules/grubcfg/main.py

@@ -110,15 +110,15 @@ def modify_grub_default(partitions, root_mount_point, distributor):
             if partition["fs"] == "linuxswap" and not has_luks:
                 swap_uuid = partition["uuid"]
 
+            if (partition["fs"] == "linuxswap" and has_luks):
+                swap_outer_mappername = partition["luksMapperName"]
+
             if (partition["mountPoint"] == "/" and has_luks):
                 cryptdevice_params = [
                     "cryptdevice=UUID={!s}:{!s}".format(
                         partition["luksUuid"], partition["luksMapperName"]
                         ),
                     "root=/dev/mapper/{!s}".format(
-                        partition["luksMapperName"]
-                        ),
-                    "resume=/dev/mapper/{!s}".format(
                         partition["luksMapperName"]
                         )
                 ]
@@ -136,7 +136,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
 
     if have_dracut and swap_outer_uuid:
         kernel_params.append("rd.luks.uuid={!s}".format(swap_outer_uuid))
-    if have_dracut and swap_outer_mappername:
+    if swap_outer_mappername:
         kernel_params.append("resume=/dev/mapper/{!s}".format(
             swap_outer_mappername))
 

src/modules/welcomeq/WelcomeQmlViewStep.cpp

@@ -51,7 +51,6 @@ WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent )
 // 			 this,
 // 			 &WelcomeQmlViewStep::nextStatusChanged );
 //     emit nextStatusChanged(true);
-    qmlRegisterSingletonType< Config >( "io.calamares.module", 1, 0, "Welcome", [&](QQmlEngine*, QJSEngine*) -> QObject* { return m_config; } );
 }
 
 
@@ -158,6 +157,7 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 	}
 
     Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
+    setContextProperty( "Welcome", m_config );
 }
 
 Calamares::RequirementsList

src/modules/welcomeq/welcomeq.qml

@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-import calamares.ui 1.0
+import io.calamares.ui 1.0
 
 import QtQuick 2.10
 import QtQuick.Controls 2.10