Bump.

increase readability.

CMakeLists.txt

@@ -101,7 +101,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
 
 set( CALAMARES_VERSION_MAJOR 2 )
 set( CALAMARES_VERSION_MINOR 2 )
-set( CALAMARES_VERSION_PATCH 90 )
+set( CALAMARES_VERSION_PATCH 3 )
 set( CALAMARES_VERSION_RC 0 )
 
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )

calamares.desktop

@@ -8,5 +8,5 @@ Exec=pkexec /usr/bin/calamares
 Comment=Calamares — System Installer
 Icon=calamares
 Terminal=false
-StartupNotify=false
+StartupNotify=true
 Categories=Qt;System;

src/calamares/CalamaresApplication.cpp

@@ -86,7 +86,11 @@ CalamaresApplication::init()
     setWindowIcon( QIcon( Calamares::Branding::instance()->
                           imagePath( Calamares::Branding::ProductIcon ) ) );
 
+    cDebug() << "STARTUP: initQmlPath, initSettings, initBranding done";
+
     initModuleManager(); //also shows main window
+
+    cDebug() << "STARTUP: initModuleManager: module init started";
 }
 
 
@@ -328,7 +332,9 @@ CalamaresApplication::initModuleManager()
 void
 CalamaresApplication::initView()
 {
+    cDebug() << "STARTUP: initModuleManager: all modules init done";
     initJobQueue();
+    cDebug() << "STARTUP: initJobQueue done";
 
     m_mainwindow = new CalamaresWindow(); //also creates ViewManager
 
@@ -340,15 +346,19 @@ CalamaresApplication::initView()
     m_mainwindow->move(
         this->desktop()->availableGeometry().center() -
         m_mainwindow->rect().center() );
+
+    cDebug() << "STARTUP: CalamaresWindow created; loadModules started";
 }
 
 
 void
 CalamaresApplication::initViewSteps()
 {
+    cDebug() << "STARTUP: loadModules for all modules done";
     m_mainwindow->show();
     ProgressTreeModel* m = new ProgressTreeModel( this );
     ProgressTreeView::instance()->setModel( m );
+    cDebug() << "STARTUP: Window now visible and ProgressTreeView populated";
 }
 
 

src/modules/bootloader/main.py

@@ -89,31 +89,12 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
     distribution = get_bootloader_entry_name()
     kernel = libcalamares.job.configuration["kernel"]
     img = libcalamares.job.configuration["img"]
-    kernel_params = ["quiet"]
-
     partitions = libcalamares.globalstorage.value("partitions")
-    swap_uuid = ""
-
-    cryptdevice_params = []
+    swap = ""
 
     for partition in partitions:
         if partition["fs"] == "linuxswap":
-            swap_uuid = partition["uuid"]
-
-        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
-            cryptdevice_params = [
-                "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
-                                                    partition["luksMapperName"]),
-                "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
-            ]
-
-    if cryptdevice_params:
-        kernel_params.extend(cryptdevice_params)
-    else:
-        kernel_params.append("root=UUID={!s}".format(uuid))
-
-    if swap_uuid:
-        kernel_params.append("resume=UUID={!s}".format(swap_uuid))
+            swap = partition["uuid"]
 
     lines = [
         '## This is just an example config file.\n',
@@ -122,12 +103,12 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
         "title   {!s}{!s}\n".format(distribution, kernel_line),
         "linux   {!s}\n".format(kernel),
         "initrd  {!s}\n".format(img),
-        "options {!s} rw\n".format(" ".join(kernel_params)),
+        "options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap),
     ]
 
-    with open(conf_path, 'w') as conf_file:
-        for line in lines:
-            conf_file.write(line)
+    with open(conf_path, 'w') as f:
+        for l in lines:
+            f.write(l)
 
 
 def create_loader(loader_path):
@@ -144,9 +125,9 @@ def create_loader(loader_path):
         "default {!s}\n".format(distribution_translated),
     ]
 
-    with open(loader_path, 'w') as loader_file:
-        for line in lines:
-            loader_file.write(line)
+    with open(loader_path, 'w') as f:
+        for l in lines:
+            f.write(l)
 
 
 def install_systemd_boot(efi_directory):
@@ -157,24 +138,17 @@ def install_systemd_boot(efi_directory):
     print("Bootloader: systemd-boot")
     install_path = libcalamares.globalstorage.value("rootMountPoint")
     install_efi_directory = install_path + efi_directory
+    fallback_kernel_line = libcalamares.job.configuration["fallbackKernelLine"]
     uuid = get_uuid()
     distribution = get_bootloader_entry_name()
     file_name_sanitizer = str.maketrans(" /", "_-")
     distribution_translated = distribution.translate(file_name_sanitizer)
-    conf_path = os.path.join(install_efi_directory,
-                             "loader",
-                             "entries",
+    conf_path = os.path.join(install_efi_directory, "loader", "entries",
                              "{!s}.conf".format(distribution_translated))
-    fallback_path = os.path.join(install_efi_directory,
-                                 "loader",
-                                 "entries",
+    fallback_path = os.path.join(install_efi_directory, "loader", "entries",
                                  "{!s}-fallback.conf".format(distribution_translated))
-    loader_path = os.path.join(install_efi_directory,
-                               "loader",
-                               "loader.conf")
-    subprocess.call(["bootctl",
-                     "--path={!s}".format(install_efi_directory),
-                     "install"])
+    loader_path = os.path.join(install_efi_directory, "loader", "loader.conf")
+    subprocess.call(["bootctl", "--path={!s}".format(install_efi_directory), "install"])
     kernel_line = get_kernel_line("default")
     print("Configure: \"{!s}\"".format(kernel_line))
     create_systemd_boot_conf(uuid, conf_path, kernel_line)
@@ -204,37 +178,29 @@ def install_grub(efi_directory, fw_type):
             efi_bootloader_id = distribution.translate(file_name_sanitizer)
         # get bitness of the underlying UEFI
         try:
-            sysfile = open("/sys/firmware/efi/fw_platform_size", "r")
-            efi_bitness = sysfile.read(2)
-        except Exception:
-            # if the kernel is older than 4.0, the UEFI bitness likely isn't
-            # exposed to the userspace so we assume a 64 bit UEFI here
+            f = open("/sys/firmware/efi/fw_platform_size", "r")
+            efi_bitness = f.read(2)
+        except:
+            # if the kernel is older than 4.0, the UEFI bitness likely isn't exposed to the userspace
+            # so we assume a 64 bit UEFI here
             efi_bitness = "64"
         bitness_translate = {"32": "--target=i386-efi", "64": "--target=x86_64-efi"}
-        check_target_env_call([libcalamares.job.configuration["grubInstall"],
-                               bitness_translate[efi_bitness],
-                               "--efi-directory={!s}".format(efi_directory),
-                               "--bootloader-id={!s}".format(efi_bootloader_id),
-                               "--force"])
+        check_target_env_call([libcalamares.job.configuration["grubInstall"], bitness_translate[efi_bitness],
+                           "--efi-directory={!s}".format(efi_directory),
+                           "--bootloader-id={!s}".format(efi_bootloader_id),
+                           "--force"])
         # Workaround for some UEFI firmwares
         check_target_env_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)])
-        check_target_env_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,
-                                                                    efi_bootloader_id),
-                               "{!s}/boot/bootx64.efi".format(efi_directory_firmware)])
+        check_target_env_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware, efi_bootloader_id),
+                           "{!s}/boot/bootx64.efi".format(efi_directory_firmware)])
     else:
         print("Bootloader: grub (bios)")
         boot_loader = libcalamares.globalstorage.value("bootLoader")
-        check_target_env_call([libcalamares.job.configuration["grubInstall"],
-                               "--target=i386-pc",
-                               "--recheck",
-                               "--force",
-                               boot_loader["installPath"]])
+        check_target_env_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc",
+                           "--recheck", "--force", boot_loader["installPath"]])
 
-    # The file specified in grubCfg should already be filled out
-    # by the grubcfg job module.
-    check_target_env_call([libcalamares.job.configuration["grubMkconfig"],
-                           "-o",
-                           libcalamares.job.configuration["grubCfg"]])
+    check_target_env_call([libcalamares.job.configuration["grubMkconfig"], "-o",
+                       libcalamares.job.configuration["grubCfg"]])
 
 
 def prepare_bootloader(fw_type):

src/modules/grubcfg/main.py

@@ -44,24 +44,12 @@ def modify_grub_default(partitions, root_mount_point, distributor):
     if plymouth_bin == 0:
         use_splash = "splash"
 
-    cryptdevice_params = []
-
     for partition in partitions:
         if partition["fs"] == "linuxswap":
             swap_uuid = partition["uuid"]
 
-        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
-            cryptdevice_params = [
-                "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
-                                                    partition["luksMapperName"]),
-                "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
-            ]
-
     kernel_params = ["quiet"]
 
-    if cryptdevice_params:
-        kernel_params.extend(cryptdevice_params)
-
     if use_splash:
         kernel_params.append(use_splash)
 
@@ -135,9 +123,6 @@ def modify_grub_default(partitions, root_mount_point, distributor):
     if not have_distributor_line:
         lines.append(distributor_line)
 
-    if cryptdevice_params:
-        lines.append("GRUB_ENABLE_CRYPTODISK=y")
-
     with open(default_grub, 'w') as grub_file:
         grub_file.write("\n".join(lines) + "\n")
 

src/modules/initcpiocfg/main.py

@@ -22,6 +22,7 @@
 import libcalamares
 import os
 from collections import OrderedDict
+from libcalamares.utils import check_target_env_call
 
 
 def cpuinfo():
@@ -35,8 +36,8 @@ def cpuinfo():
 
     nprocs = 0
 
-    with open('/proc/cpuinfo') as cpuinfo_file:
-        for line in cpuinfo_file:
+    with open('/proc/cpuinfo') as f:
+        for line in f:
             if not line.strip():
                 # end of one processor
                 cpu_info["proc{!s}".format(nprocs)] = procinfo
@@ -52,12 +53,11 @@ def cpuinfo():
     return cpu_info
 
 
-def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
+def set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point):
     """ Set up mkinitcpio.conf.
 
     :param hooks:
     :param modules:
-    :param files:
     :param root_mount_point:
     """
     with open("/etc/mkinitcpio.conf", "r") as mkinitcpio_file:
@@ -70,9 +70,6 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
         elif mklins[i].startswith("MODULES"):
             joined_modules = ' '.join(modules)
             mklins[i] = "MODULES=\"{!s}\"".format(joined_modules)
-        elif mklins[i].startswith("FILES"):
-            joined_files = ' '.join(files)
-            mklins[i] = "FILES=\"{!s}\"".format(joined_files)
 
     path = os.path.join(root_mount_point, "etc/mkinitcpio.conf")
 
@@ -91,8 +88,6 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     btrfs = ""
     hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
     modules = []
-    files = []
-    encrypt_hook = False
 
     # It is important that the plymouth hook comes before any encrypt hook
     plymouth_bin = os.path.join(root_mount_point, "usr/bin/plymouth")
@@ -106,14 +101,6 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
         if partition["fs"] == "btrfs":
             btrfs = "yes"
 
-        if partition["mountPoint"] == "/" and partition["luksMapperName"]:
-            encrypt_hook = True
-
-    if encrypt_hook:
-        hooks.append("encrypt")
-        if os.path.isfile(os.path.join(root_mount_point, "crypto_keyfile.bin")):
-            files.append("/crypto_keyfile.bin")
-
     if swap_uuid is not "":
         hooks.extend(["resume", "filesystems"])
     else:
@@ -126,7 +113,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     else:
         hooks.append("fsck")
 
-    write_mkinitcpio_lines(hooks, modules, files, root_mount_point)
+    set_mkinitcpio_hooks_and_modules(hooks, modules, root_mount_point)
 
 
 def run():

src/modules/locale/LocalePage.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -225,41 +225,60 @@ LocalePage::init( const QString& initialRegion,
     }
     emit m_tzWidget->locationChanged( m_tzWidget->getCurrentLocation() );
 
-    // Fill in meaningful locale/charset lines from locale.gen
+    // Some distros come with a meaningfully commented and easy to parse locale.gen,
+    // and others ship a separate file /usr/share/i18n/SUPPORTED with a clean list of
+    // supported locales. We first try that one, and if it doesn't exist, we fall back
+    // to parsing the lines from locale.gen
     m_localeGenLines.clear();
-    QFile localeGen( localeGenPath );
+    QFile supported( "/usr/share/i18n/SUPPORTED" );
     QByteArray ba;
-    if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
+
+    if ( supported.exists() &&
+         supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
     {
-        ba = localeGen.readAll();
-        localeGen.close();
+        ba = supported.readAll();
+        supported.close();
+
+        foreach ( QByteArray line, ba.split( '\n' ) )
+        {
+            m_localeGenLines.append( QString::fromLatin1( line.simplified() ) );
+        }
     }
     else
     {
-        cDebug() << "Cannot open file" << localeGenPath
-                 << ". Assuming the supported languages are already built into "
-                    "the locale archive.";
-        QProcess localeA;
-        localeA.start( "locale", QStringList() << "-a" );
-        localeA.waitForFinished();
-        ba = localeA.readAllStandardOutput();
-    }
-    foreach ( QByteArray line, ba.split( '\n' ) )
-    {
-        if ( line.startsWith( "## " ) ||
-             line.startsWith( "# " ) ||
-             line.simplified() == "#" )
-            continue;
+        QFile localeGen( localeGenPath );
+        if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
+        {
+            ba = localeGen.readAll();
+            localeGen.close();
+        }
+        else
+        {
+            cDebug() << "Cannot open file" << localeGenPath
+                     << ". Assuming the supported languages are already built into "
+                        "the locale archive.";
+            QProcess localeA;
+            localeA.start( "locale", QStringList() << "-a" );
+            localeA.waitForFinished();
+            ba = localeA.readAllStandardOutput();
+        }
+        foreach ( QByteArray line, ba.split( '\n' ) )
+        {
+            if ( line.startsWith( "## " ) ||
+                 line.startsWith( "# " ) ||
+                 line.simplified() == "#" )
+                continue;
 
-        QString lineString = QString::fromLatin1( line.simplified() );
-        if ( lineString.startsWith( "#" ) )
-            lineString.remove( '#' );
-        lineString = lineString.simplified();
+            QString lineString = QString::fromLatin1( line.simplified() );
+            if ( lineString.startsWith( "#" ) )
+                lineString.remove( '#' );
+            lineString = lineString.simplified();
 
-        if ( lineString.isEmpty() )
-            continue;
+            if ( lineString.isEmpty() )
+                continue;
 
-        m_localeGenLines.append( lineString );
+            m_localeGenLines.append( lineString );
+        }
     }
 }
 

src/modules/localecfg/main.py

@@ -27,7 +27,7 @@ import libcalamares
 
 def run():
     """ Create locale """
-    us = '#en_US'
+    en_us_locale = '#en_US'
     locale = libcalamares.globalstorage.value("lcLocale")
 
     if not locale:
@@ -50,23 +50,30 @@ def run():
         # always enable en_US
         with open("{!s}/etc/locale.gen".format(install_path), "w") as gen:
             for line in text:
-                if us in line and line[0] == "#":
+                if en_us_locale in line and line[0] == "#":
                     # uncomment line
-                    line = line[1:]
+                    line = line[1:].lstrip()
 
                 if locale in line and line[0] == "#":
                     # uncomment line
-                    line = line[1:]
+                    line = line[1:].lstrip()
 
                 gen.write(line)
 
         libcalamares.utils.target_env_call(['locale-gen'])
         print('locale.gen done')
 
+    # write /etc/locale.conf
     locale_conf_path = os.path.join(install_path, "etc/locale.conf")
-
     with open(locale_conf_path, "w") as locale_conf:
         locale_split = locale.split(' ')[0]
         locale_conf.write("LANG={!s}\n".format(locale_split))
 
+    # write /etc/default/locale if /etc/default exists and is a dir
+    etc_default_path = os.path.join(install_path, "etc/default")
+    if os.path.isdir(etc_default_path):
+        with open(os.path.join(etc_default_path, "locale"), "w") as etc_default_locale:
+            locale_split = locale.split(' ')[0]
+            etc_default_locale.write("LANG={!s}\n".format(locale_split))
+
     return None

src/modules/luksbootkeyfile/main.py

@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# === This file is part of Calamares - <http://github.com/calamares> ===
-#
-#   Copyright 2016, Teo Mrnjavac <teo@kde.org>
-#
-#   Calamares is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   Calamares is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
-
-import libcalamares
-
-from libcalamares.utils import check_target_env_call
-
-
-def run():
-    """
-    This module sets up a file crypto_keyfile.bin on the rootfs, assuming the rootfs
-    is LUKS encrypted and a passphrase is provided. This file is then included in the
-    initramfs and used for unlocking the rootfs from a previously unlocked GRUB2
-    session.
-    :return:
-    """
-
-    partitions = libcalamares.globalstorage.value("partitions")
-
-    luks_device = ""
-    luks_passphrase = ""
-
-    for partition in partitions:
-        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
-            luks_device = partition["device"]
-            luks_passphrase = partition["luksPassphrase"]
-
-    if not luks_device:
-        return None
-
-    if not luks_passphrase:
-        return ("Encrypted rootfs setup error",
-                "Rootfs partition {!s} is LUKS but no passphrase found.".format(luks_device))
-
-    # Generate random keyfile
-    check_target_env_call(["dd",
-                           "bs=512",
-                           "count=4",
-                           "if=/dev/urandom",
-                           "of=/crypto_keyfile.bin"])
-    check_target_env_call(["cryptsetup",
-                           "luksAddKey",
-                           luks_device,
-                           "/crypto_keyfile.bin"],
-                          luks_passphrase)
-    check_target_env_call(["chmod",
-                           "g-rwx,o-rwx",
-                           "/crypto_keyfile.bin"])
-
-    return None

src/modules/luksbootkeyfile/module.desc

@@ -1,5 +0,0 @@
----
-type:       "job"
-name:       "luksbootkeyfile"
-interface:  "python"
-script:     "main.py"

src/modules/mount/main.py

@@ -30,7 +30,7 @@ def mount_partitions(root_mount_point, partitions):
     :param partitions:
     """
     for partition in partitions:
-        if "mountPoint" not in partition or not partition["mountPoint"]:
+        if not partition["mountPoint"]:
             continue
         # Create mount point with `+` rather than `os.path.join()` because
         # `partition["mountPoint"]` starts with a '/'.
@@ -40,20 +40,11 @@ def mount_partitions(root_mount_point, partitions):
         if fstype == "fat16" or fstype == "fat32":
             fstype = "vfat"
 
-        if "luksMapperName" in partition:
-            libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"]))
-            libcalamares.utils.mount("/dev/mapper/{!s}".format(partition["luksMapperName"]),
-                                     mount_point,
-                                     fstype,
-                                     partition.get("options", ""),
-                                     )
-
-        else:
-            libcalamares.utils.mount(partition["device"],
-                                     mount_point,
-                                     fstype,
-                                     partition.get("options", ""),
-                                     )
+        libcalamares.utils.mount(partition["device"],
+                                 mount_point,
+                                 fstype,
+                                 partition.get("options", ""),
+                                 )
 
 
 def run():

src/modules/partition/CMakeLists.txt

@@ -31,12 +31,11 @@ calamares_add_plugin( partition
         core/PartitionIterator.cpp
         core/PartitionModel.cpp
         core/PartUtils.cpp
-        gui/BootInfoWidget.cpp
         gui/ChoicePage.cpp
         gui/CreatePartitionDialog.cpp
-        gui/DeviceInfoWidget.cpp
         gui/EditExistingPartitionDialog.cpp
-        gui/EncryptWidget.cpp
+        gui/BootInfoWidget.cpp
+        gui/DeviceInfoWidget.cpp
         gui/PartitionPage.cpp
         gui/PartitionBarsView.cpp
         gui/PartitionLabelsView.cpp
@@ -63,7 +62,6 @@ calamares_add_plugin( partition
         gui/CreatePartitionDialog.ui
         gui/CreatePartitionTableDialog.ui
         gui/EditExistingPartitionDialog.ui
-        gui/EncryptWidget.ui
         gui/PartitionPage.ui
         gui/ReplaceWidget.ui
     LINK_LIBRARIES

src/modules/partition/core/KPMHelpers.cpp

@@ -26,7 +26,6 @@
 #include <kpmcore/core/partition.h>
 #include <kpmcore/fs/filesystemfactory.h>
 #include <kpmcore/backend/corebackendmanager.h>
-#include <kpmcore/fs/luks.h>
 
 #include <QDebug>
 
@@ -133,40 +132,6 @@ createNewPartition( PartitionNode* parent,
 }
 
 
-Partition*
-createNewEncryptedPartition( PartitionNode* parent,
-                             const Device& device,
-                             const PartitionRole& role,
-                             FileSystem::Type fsType,
-                             qint64 firstSector,
-                             qint64 lastSector,
-                             const QString& passphrase,
-                             PartitionTable::Flags flags )
-{
-    PartitionRole::Roles newRoles = role.roles();
-    if ( !role.has( PartitionRole::Luks ) )
-        newRoles |= PartitionRole::Luks;
-
-    FS::luks* fs = dynamic_cast< FS::luks* >(
-                           FileSystemFactory::create( FileSystem::Luks,
-                                                      firstSector,
-                                                      lastSector ) );
-    fs->createInnerFileSystem( fsType );
-    fs->setPassphrase( passphrase );
-    Partition* p = new Partition( parent,
-                                  device,
-                                  PartitionRole( newRoles ),
-                                  fs, fs->firstSector(), fs->lastSector(),
-                                  QString() /* path */,
-                                  PartitionTable::FlagNone /* availableFlags */,
-                                  QString() /* mountPoint */,
-                                  false /* mounted */,
-                                  flags /* activeFlags */,
-                                  Partition::StateNew );
-    return p;
-}
-
-
 Partition*
 clonePartition( Device* device, Partition* partition )
 {
@@ -198,7 +163,7 @@ prettyNameForFileSystemType( FileSystem::Type t )
     case FileSystem::Unformatted:
         return QObject::tr( "unformatted" );
     case FileSystem::LinuxSwap:
-        return QObject::tr( "swap" );
+        return "swap";
     case FileSystem::Fat16:
     case FileSystem::Fat32:
     case FileSystem::Ntfs:

src/modules/partition/core/KPMHelpers.h

@@ -91,15 +91,6 @@ Partition* createNewPartition( PartitionNode* parent,
                                qint64 lastSector,
                                PartitionTable::Flags flags = PartitionTable::FlagNone );
 
-Partition* createNewEncryptedPartition( PartitionNode* parent,
-                                        const Device& device,
-                                        const PartitionRole& role,
-                                        FileSystem::Type fsType,
-                                        qint64 firstSector,
-                                        qint64 lastSector,
-                                        const QString& passphrase,
-                                        PartitionTable::Flags flags = PartitionTable::FlagNone );
-
 Partition* clonePartition( Device* device, Partition* partition );
 
 QString prettyNameForFileSystemType( FileSystem::Type t );

src/modules/partition/core/PartitionActions.cpp

@@ -98,7 +98,7 @@ swapSuggestion( const qint64 availableSpaceB )
 
 
 void
-doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPassphrase )
+doAutopartition( PartitionCoreModule* core, Device* dev )
 {
     bool isEfi = false;
     if ( QDir( "/sys/firmware/efi/efivars" ).exists() )
@@ -167,60 +167,28 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
         lastSectorForRoot -= suggestedSwapSizeB / dev->logicalSectorSize() + 1;
     }
 
-    Partition* rootPartition = nullptr;
-    if ( luksPassphrase.isEmpty() )
-    {
-        rootPartition = KPMHelpers::createNewPartition(
-            dev->partitionTable(),
-            *dev,
-            PartitionRole( PartitionRole::Primary ),
-            FileSystem::Ext4,
-            firstFreeSector,
-            lastSectorForRoot
-        );
-    }
-    else
-    {
-        rootPartition = KPMHelpers::createNewEncryptedPartition(
-            dev->partitionTable(),
-            *dev,
-            PartitionRole( PartitionRole::Primary ),
-            FileSystem::Ext4,
-            firstFreeSector,
-            lastSectorForRoot,
-            luksPassphrase
-       );
-    }
+    Partition* rootPartition = KPMHelpers::createNewPartition(
+        dev->partitionTable(),
+        *dev,
+        PartitionRole( PartitionRole::Primary ),
+        FileSystem::Ext4,
+        firstFreeSector,
+        lastSectorForRoot
+    );
     PartitionInfo::setFormat( rootPartition, true );
     PartitionInfo::setMountPoint( rootPartition, "/" );
     core->createPartition( dev, rootPartition );
 
     if ( shouldCreateSwap )
     {
-        Partition* swapPartition = nullptr;
-        if ( luksPassphrase.isEmpty() )
-        {
-            swapPartition = KPMHelpers::createNewPartition(
-                dev->partitionTable(),
-                *dev,
-                PartitionRole( PartitionRole::Primary ),
-                FileSystem::LinuxSwap,
-                lastSectorForRoot + 1,
-                dev->totalSectors() - 1
-            );
-        }
-        else
-        {
-            swapPartition = KPMHelpers::createNewEncryptedPartition(
-                dev->partitionTable(),
-                *dev,
-                PartitionRole( PartitionRole::Primary ),
-                FileSystem::LinuxSwap,
-                lastSectorForRoot + 1,
-                dev->totalSectors() - 1,
-                luksPassphrase
-            );
-        }
+        Partition* swapPartition = KPMHelpers::createNewPartition(
+            dev->partitionTable(),
+            *dev,
+            PartitionRole( PartitionRole::Primary ),
+            FileSystem::LinuxSwap,
+            lastSectorForRoot + 1,
+            dev->totalSectors() - 1
+        );
         PartitionInfo::setFormat( swapPartition, true );
         core->createPartition( dev, swapPartition );
     }

src/modules/partition/core/PartitionActions.h

@@ -19,21 +19,14 @@
 #ifndef PARTITIONACTIONS_H
 #define PARTITIONACTIONS_H
 
-#include <QString>
-
 class PartitionCoreModule;
 class Device;
 class Partition;
 
 namespace PartitionActions
 {
-void doAutopartition( PartitionCoreModule* core,
-                      Device* dev,
-                      const QString& luksPassphrase = QString() );
-
-void doReplacePartition( PartitionCoreModule* core,
-                         Device* dev,
-                         Partition* partition );
+void doAutopartition( PartitionCoreModule* core, Device* dev );
+void doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition );
 }
 
 #endif // PARTITIONACTIONS_H

src/modules/partition/core/PartitionCoreModule.cpp

@@ -112,11 +112,12 @@ void
 PartitionCoreModule::init()
 {
     CoreBackend* backend = CoreBackendManager::self()->backend();
-    auto devices = backend->scanDevices( true );
+    QList< Device* > devices = backend->scanDevices( true );
 
     // Remove the device which contains / from the list
-    for ( auto it = devices.begin(); it != devices.end(); )
-        if ( hasRootPartition( *it ) )
+    for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); )
+        if ( hasRootPartition( *it ) ||
+             (*it)->deviceNode().startsWith( "/dev/zram") )
             it = devices.erase( it );
         else
             ++it;

src/modules/partition/gui/ChoicePage.cpp

@@ -121,7 +121,6 @@ ChoicePage::ChoicePage( QWidget* parent )
     m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
     m_previewAfterLabel->hide();
     m_previewAfterFrame->hide();
-    m_encryptWidget->hide();
     // end
 }
 
@@ -158,9 +157,6 @@ ChoicePage::init( PartitionCoreModule* core )
              static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
              this, &ChoicePage::applyDeviceChoice );
 
-    connect( m_encryptWidget, &EncryptWidget::stateChanged,
-             this, &ChoicePage::onEncryptWidgetStateChanged );
-
     ChoicePage::applyDeviceChoice();
 }
 
@@ -242,8 +238,14 @@ ChoicePage::setupChoices()
         if ( checked )  // An action was picked.
         {
             m_choice = static_cast< Choice >( id );
-            updateNextEnabled();
-
+            if ( m_choice == Replace )
+            {
+                setNextEnabled( false );
+            }
+            else
+            {
+                setNextEnabled( true );
+            }
             emit actionChosen();
         }
         else    // An action was unpicked, either on its own or because of another selection.
@@ -251,8 +253,7 @@ ChoicePage::setupChoices()
             if ( m_grp->checkedButton() == nullptr )  // If no other action is chosen, we must
             {                                         // set m_choice to NoChoice and reset previews.
                 m_choice = NoChoice;
-                updateNextEnabled();
-
+                setNextEnabled( false );
                 emit actionChosen();
             }
         }
@@ -368,14 +369,14 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
             } ),
             [ = ]
             {
-                PartitionActions::doAutopartition( m_core, selectedDevice(), m_encryptWidget->passphrase() );
+                PartitionActions::doAutopartition( m_core, selectedDevice() );
                 emit deviceChosen();
             },
             this );
         }
         else
         {
-            PartitionActions::doAutopartition( m_core, selectedDevice(), m_encryptWidget->passphrase() );
+            PartitionActions::doAutopartition( m_core, selectedDevice() );
             emit deviceChosen();
         }
 
@@ -391,7 +392,7 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
             []{},
             this );
         }
-        updateNextEnabled();
+        setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
 
         connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
                  this, SLOT( doReplaceSelectedPartition( QModelIndex, QModelIndex ) ),
@@ -414,7 +415,7 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
             },
             this );
         }
-        updateNextEnabled();
+        setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
 
         connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
                  this, SLOT( doAlongsideSetupSplitter( QModelIndex, QModelIndex ) ),
@@ -465,7 +466,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
                 Calamares::Branding::instance()->
                     string( Calamares::Branding::ProductName ) );
 
-    updateNextEnabled();
+    setNextEnabled( m_beforePartitionBarsView->selectionModel()->currentIndex().isValid() );
 
     if ( m_isEfi )
         setupEfiSystemPartitionSelector();
@@ -474,20 +475,6 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
 }
 
 
-void
-ChoicePage::onEncryptWidgetStateChanged()
-{
-    EncryptWidget::State state = m_encryptWidget->state();
-    if ( m_choice == Erase )
-    {
-        if ( state == EncryptWidget::EncryptionConfirmed ||
-             state == EncryptWidget::EncryptionDisabled )
-            applyActionChoice( m_choice );
-    }
-    updateNextEnabled();
-}
-
-
 void
 ChoicePage::onLeave()
 {
@@ -641,7 +628,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
         if ( m_isEfi )
             setupEfiSystemPartitionSelector();
 
-        updateNextEnabled();
+        setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
         if ( !m_bootloaderComboBox.isNull() &&
              m_bootloaderComboBox->currentIndex() < 0 )
             m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
@@ -783,12 +770,10 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
             };
             m_beforePartitionBarsView->setSelectionFilter( filter );
             m_beforePartitionLabelsView->setSelectionFilter( filter );
-            m_encryptWidget->hide();
 
             break;
         }
     case Erase:
-        m_encryptWidget->show();
     case Replace:
         {
             m_previewBeforeLabel->setText( tr( "Current:" ) );
@@ -869,7 +854,6 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
         m_previewAfterFrame->hide();
         m_previewBeforeLabel->setText( tr( "Current:" ) );
         m_previewAfterLabel->hide();
-        m_encryptWidget->hide();
         break;
     }
 
@@ -919,7 +903,7 @@ ChoicePage::setupEfiSystemPartitionSelector()
                         "partitioning to set up %1." )
                     .arg( Calamares::Branding::instance()->
                           string( Calamares::Branding::ShortProductName ) ) );
-        updateNextEnabled();
+        setNextEnabled( false );
     }
     else if ( efiSystemPartitions.count() == 1 ) //probably most usual situation
     {
@@ -1209,42 +1193,8 @@ ChoicePage::currentChoice() const
 
 
 void
-ChoicePage::updateNextEnabled()
+ChoicePage::setNextEnabled( bool enabled )
 {
-    bool enabled = false;
-
-    switch ( m_choice )
-    {
-    case NoChoice:
-        enabled = false;
-        break;
-    case Replace:
-        enabled = !m_beforePartitionBarsView->selectionModel()->
-                  selectedRows().isEmpty();
-        break;
-    case Alongside:
-        enabled = !m_beforePartitionBarsView->selectionModel()->
-                  selectedRows().isEmpty() &&
-                  m_beforePartitionBarsView->selectionModel()->
-                  currentIndex().isValid();
-        break;
-    case Erase:
-    case Manual:
-        enabled = true;
-    }
-
-    if ( m_isEfi &&
-         ( m_choice == Alongside ||
-           m_choice == Replace ) )
-    {
-        if ( m_core->efiSystemPartitions().count() == 0 )
-            enabled = false;
-    }
-
-    if ( m_encryptWidget->isVisible() &&
-         m_encryptWidget->state() == EncryptWidget::EncryptionUnconfirmed )
-        enabled = false;
-
     if ( enabled == m_nextEnabled )
         return;
 

src/modules/partition/gui/ChoicePage.h

@@ -74,10 +74,9 @@ signals:
 private slots:
     void doReplaceSelectedPartition( const QModelIndex& current, const QModelIndex& previous );
     void doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous );
-    void onEncryptWidgetStateChanged();
 
 private:
-    void updateNextEnabled();
+    void setNextEnabled( bool enabled );
     void setupChoices();
     QComboBox* createBootloaderComboBox( QWidget* parentButton );
     Device* selectedDevice();

src/modules/partition/gui/ChoicePage.ui

@@ -32,7 +32,7 @@
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="m_rightLayout" stretch="0,1,0,0,0,0">
+    <layout class="QVBoxLayout" name="m_rightLayout" stretch="0,1,0,0,0">
      <item>
       <widget class="QLabel" name="m_messageLabel">
        <property name="toolTip">
@@ -63,7 +63,7 @@
           <x>0</x>
           <y>0</y>
           <width>729</width>
-          <height>276</height>
+          <height>327</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="m_itemsLayout">
@@ -93,9 +93,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="EncryptWidget" name="m_encryptWidget" native="true"/>
-     </item>
      <item>
       <widget class="QLabel" name="m_selectLabel">
        <property name="text">
@@ -200,14 +197,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>EncryptWidget</class>
-   <extends>QWidget</extends>
-   <header>gui/EncryptWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

src/modules/partition/gui/EncryptWidget.cpp

@@ -1,150 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "EncryptWidget.h"
-
-#include <utils/CalamaresUtilsGui.h>
-
-EncryptWidget::EncryptWidget( QWidget* parent )
-    : QWidget( parent )
-{
-    setupUi( this );
-
-    m_iconLabel->setFixedWidth( m_iconLabel->height() );
-    m_passphraseLineEdit->hide();
-    m_confirmLineEdit->hide();
-    m_iconLabel->hide();
-
-    connect( m_encryptCheckBox, &QCheckBox::stateChanged,
-             this, &EncryptWidget::onCheckBoxStateChanged );
-    connect( m_passphraseLineEdit, &QLineEdit::textEdited,
-             this, &EncryptWidget::onPassphraseEdited );
-    connect( m_confirmLineEdit, &QLineEdit::textEdited,
-             this, &EncryptWidget::onPassphraseEdited );
-
-    updateState();
-}
-
-
-EncryptWidget::State
-EncryptWidget::state() const
-{
-    return m_state;
-}
-
-
-QString
-EncryptWidget::passphrase() const
-{
-    if ( m_state == EncryptionConfirmed )
-        return m_passphraseLineEdit->text();
-    return QString();
-}
-
-
-void
-EncryptWidget::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-    case QEvent::LanguageChange:
-        retranslateUi( this );
-        break;
-    default:
-        break;
-    }
-}
-
-
-void
-EncryptWidget::updateState()
-{
-    State newState;
-    if ( m_encryptCheckBox->isChecked() )
-    {
-        if ( !m_passphraseLineEdit->text().isEmpty() &&
-             m_passphraseLineEdit->text() == m_confirmLineEdit->text() )
-        {
-            newState = EncryptionConfirmed;
-        }
-        else
-        {
-            newState = EncryptionUnconfirmed;
-        }
-    }
-    else
-    {
-        newState = EncryptionDisabled;
-    }
-
-    if ( newState != m_state )
-    {
-        m_state = newState;
-        emit stateChanged( m_state );
-    }
-}
-
-
-void
-EncryptWidget::onPassphraseEdited()
-{
-    if ( !m_iconLabel->isVisible() )
-        m_iconLabel->show();
-
-    QString p1 = m_passphraseLineEdit->text();
-    QString p2 = m_confirmLineEdit->text();
-
-    m_iconLabel->setToolTip( QString() );
-    if ( p1.isEmpty() && p2.isEmpty() )
-    {
-        m_iconLabel->clear();
-    }
-    else if ( p1 == p2 )
-    {
-        m_iconLabel->setFixedWidth( m_iconLabel->height() );
-        m_iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes,
-                                                               CalamaresUtils::Original,
-                                                               m_iconLabel->size() ) );
-    }
-    else
-    {
-        m_iconLabel->setFixedWidth( m_iconLabel->height() );
-        m_iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No,
-                                                               CalamaresUtils::Original,
-                                                               m_iconLabel->size() ) );
-        m_iconLabel->setToolTip( "Please enter the same passphrase in both boxes." );
-    }
-
-    updateState();
-}
-
-
-void
-EncryptWidget::onCheckBoxStateChanged( int state )
-{
-    m_passphraseLineEdit->setVisible( state );
-    m_confirmLineEdit->setVisible( state );
-    m_iconLabel->setVisible( state );
-    m_passphraseLineEdit->clear();
-    m_confirmLineEdit->clear();
-    m_iconLabel->clear();
-
-    updateState();
-}

src/modules/partition/gui/EncryptWidget.h

@@ -1,57 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef ENCRYPTWIDGET_H
-#define ENCRYPTWIDGET_H
-
-#include "ui_EncryptWidget.h"
-
-class EncryptWidget : public QWidget, private Ui::EncryptWidget
-{
-    Q_OBJECT
-
-public:
-    enum State : unsigned short
-    {
-        EncryptionDisabled = 0,
-        EncryptionUnconfirmed,
-        EncryptionConfirmed
-    };
-
-    explicit EncryptWidget( QWidget* parent = nullptr );
-
-    State state() const;
-
-    QString passphrase() const;
-
-signals:
-    void stateChanged( State );
-
-protected:
-    void changeEvent( QEvent* e );
-
-private:
-    void updateState();
-    void onPassphraseEdited();
-    void onCheckBoxStateChanged( int state );
-
-    State m_state;
-};
-
-#endif // ENCRYPTWIDGET_H

src/modules/partition/gui/EncryptWidget.ui

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EncryptWidget</class>
- <widget class="QWidget" name="EncryptWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>822</width>
-    <height>59</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QCheckBox" name="m_encryptCheckBox">
-     <property name="text">
-      <string>En&amp;crypt system</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="m_passphraseLineEdit">
-     <property name="echoMode">
-      <enum>QLineEdit::Password</enum>
-     </property>
-     <property name="placeholderText">
-      <string>Passphrase</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="m_confirmLineEdit">
-     <property name="echoMode">
-      <enum>QLineEdit::Password</enum>
-     </property>
-     <property name="placeholderText">
-      <string>Confirm passphrase</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_iconLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/modules/partition/gui/PartitionPage.cpp

@@ -54,6 +54,7 @@
 PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
     : QWidget( parent )
     , m_ui( new Ui_PartitionPage )
+    , m_lastSelectedBootLoaderIndex(-1)
     , m_core( core )
 {
     m_ui->setupUi( this );
@@ -74,6 +75,11 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
     {
         updateFromCurrentDevice();
     } );
+    connect( m_ui->bootLoaderComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::activated),
+                [ this ]( const QString& /* text */ )
+    {
+        m_lastSelectedBootLoaderIndex = m_ui->bootLoaderComboBox->currentIndex();
+    } );
 
     connect( m_ui->bootLoaderComboBox, &QComboBox::currentTextChanged,
              [ this ]( const QString& /* text */ )
@@ -94,7 +100,7 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent )
         m_ui->bootLoaderComboBox->hide();
         m_ui->label_3->hide();
     }
-    
+
     CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); )
 }
 
@@ -152,6 +158,9 @@ PartitionPage::onNewPartitionTableClicked()
         m_core->createPartitionTable( device, type );
     }
     delete dlg;
+    // PartionModelReset isn't emmited after createPartitionTable, so we have to manually update
+    // the bootLoader index after the reset.
+    updateBootLoaderIndex();
 }
 
 void
@@ -188,6 +197,7 @@ PartitionPage::onEditClicked()
         updatePartitionToCreate( model->device(), partition );
     else
         editExistingPartition( model->device(), partition );
+
 }
 
 void
@@ -217,7 +227,12 @@ PartitionPage::onRevertClicked()
             m_ui->deviceComboBox->setCurrentIndex( oldIndex );
             updateFromCurrentDevice();
         } ),
-        []{},
+        [ this ]{
+            m_lastSelectedBootLoaderIndex = -1;
+            if( m_ui->bootLoaderComboBox->currentIndex() < 0 ) {
+                m_ui->bootLoaderComboBox->setCurrentIndex( 0 );
+            }
+        },
         this );
 }
 
@@ -336,4 +351,14 @@ PartitionPage::onPartitionModelReset()
 {
     m_ui->partitionTreeView->expandAll();
     updateButtons();
+    updateBootLoaderIndex();
+}
+
+void
+PartitionPage::updateBootLoaderIndex()
+{
+    // set bootloader back to user selected index
+    if ( m_lastSelectedBootLoaderIndex >= 0 && m_ui->bootLoaderComboBox->count() ) {
+        m_ui->bootLoaderComboBox->setCurrentIndex( m_lastSelectedBootLoaderIndex );
+    }
 }

src/modules/partition/gui/PartitionPage.h

@@ -60,8 +60,10 @@ private:
     void editExistingPartition( Device*, Partition* );
     void updateBootLoaderInstallPath();
     void updateFromCurrentDevice();
+    void updateBootLoaderIndex();
 
     QMutex m_revertMutex;
+    int    m_lastSelectedBootLoaderIndex;
 };
 
 #endif // PARTITIONPAGE_H

src/modules/partition/gui/PartitionViewStep.cpp

@@ -52,13 +52,15 @@
 #include <QProcess>
 #include <QStackedWidget>
 #include <QTimer>
+#include <QtConcurrent/QtConcurrent>
+#include <QFutureWatcher>
 
 PartitionViewStep::PartitionViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new QStackedWidget() )
-    , m_core( new PartitionCoreModule( this ) )
+    , m_core( nullptr )
     , m_choicePage( nullptr )
-    , m_manualPartitionPage( new PartitionPage( m_core ) )
+    , m_manualPartitionPage( nullptr )
 {
     m_widget->setContentsMargins( 0, 0, 0, 0 );
 
@@ -70,10 +72,21 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
 }
 
 
+void
+PartitionViewStep::initPartitionCoreModule()
+{
+    Q_ASSERT( !m_core );
+    m_core = new PartitionCoreModule( this );
+}
+
+
 void
 PartitionViewStep::continueLoading()
 {
     Q_ASSERT( !m_choicePage );
+    Q_ASSERT( !m_manualPartitionPage );
+
+    m_manualPartitionPage = new PartitionPage( m_core );
     m_choicePage = new ChoicePage();
 
     m_choicePage->init( m_core );
@@ -463,7 +476,20 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         gs->insert( "drawNestedPartitions", false );
     }
 
-    QTimer::singleShot( 0, this, &PartitionViewStep::continueLoading );
+    // Now that we have the config, we load the PartitionCoreModule in the background
+    // because it could take a while. Then when it's done, we can set up the widgets
+    // and remove the spinner.
+    QFutureWatcher< void >* watcher = new QFutureWatcher< void >();
+    connect( watcher, &QFutureWatcher< void >::finished,
+             this, [ this, watcher ]
+    {
+        continueLoading();
+        watcher->deleteLater();
+    } );
+
+    QFuture< void > future =
+            QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
+    watcher->setFuture( future );
 }
 
 

src/modules/partition/gui/PartitionViewStep.h

@@ -44,8 +44,6 @@ public:
     explicit PartitionViewStep( QObject* parent = 0 );
     virtual ~PartitionViewStep();
 
-    void continueLoading();
-
     QString prettyName() const override;
     QWidget* createSummaryWidget() const override;
 
@@ -68,6 +66,9 @@ public:
     QList< Calamares::job_ptr > jobs() const override;
 
 private:
+    void initPartitionCoreModule();
+    void continueLoading();
+
     PartitionCoreModule* m_core;
     QStackedWidget*   m_widget;
     ChoicePage*       m_choicePage;

src/modules/partition/jobs/FillGlobalStorageJob.cpp

@@ -31,13 +31,11 @@
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
 #include <kpmcore/fs/filesystem.h>
-#include <kpmcore/fs/luks.h>
 
 // Qt
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
-#include <QProcess>
 
 typedef QHash<QString, QString> UuidForPartitionHash;
 
@@ -63,22 +61,6 @@ findPartitionUuids( QList < Device* > devices )
     return hash;
 }
 
-
-static QString
-getLuksUuid( const QString& path )
-{
-    QProcess process;
-    process.setProgram( "cryptsetup" );
-    process.setArguments( { "luksUUID", path } );
-    process.start();
-    process.waitForFinished();
-    if ( process.exitStatus() != QProcess::NormalExit || process.exitCode() )
-        return QString();
-    QString uuid = QString::fromLocal8Bit( process.readAllStandardOutput() ).trimmed();
-    return uuid;
-}
-
-
 static QVariant
 mapForPartition( Partition* partition, const QString& uuid )
 {
@@ -91,20 +73,6 @@ mapForPartition( Partition* partition, const QString& uuid )
              << "mtpoint:" << PartitionInfo::mountPoint( partition )
              << "fs:" << partition->fileSystem().name()
              << uuid;
-
-    if ( partition->roles().has( PartitionRole::Luks ) )
-    {
-        const FileSystem& fsRef = partition->fileSystem();
-        const FS::luks* luksFs = dynamic_cast< const FS::luks* >( &fsRef );
-        if ( luksFs )
-        {
-            map[ "luksMapperName" ] = luksFs->mapperName( partition->partitionPath() ).split( "/" ).last();
-            map[ "luksUuid" ] = getLuksUuid( partition->partitionPath() );
-            map[ "luksPassphrase" ] = luksFs->passphrase();
-            cDebug() << "luksMapperName:" << map[ "luksMapperName" ];
-        }
-    }
-
     return map;
 }