[merge] with upstream

.travis.yml

@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 language: cpp
 
 python:
@@ -16,5 +19,5 @@ install:
   - docker build -t calamares .
 
 script:
-  - docker run -v $PWD:/src --tmpfs /build:rw,size=81920k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"
+  - docker run -v $PWD:/src --tmpfs /build:rw,size=112M -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"
 

src/branding/manjaro/branding.desc

@@ -49,10 +49,10 @@ windowPlacement: center
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             19.0
+    version:             20.1
-    shortVersion:        19.0
+    shortVersion:        20.1
-    versionedName:       Manjaro Linux 19.0 "Kyria"
+    versionedName:       Manjaro Linux 20.1 "Mikah"
-    shortVersionedName:  Manjaro 19.0
+    shortVersionedName:  Manjaro 20.1
     bootloaderEntryName: Manjaro
 
 # These images are loaded from the branding module directory.
@@ -78,6 +78,19 @@ images:
 # installer is actually writing to disk and doing other slow things).
 slideshow:               "show.qml"
 
+# There are two available APIs for a QML slideshow:
+#  - 1 (the default) loads the entire slideshow when the installation-
+#      slideshow page is shown and starts the QML then. The QML
+#      is never stopped (after installation is done, times etc.
+#      continue to fire).
+#  - 2 loads the slideshow on startup and calls onActivate() and
+#      onLeave() in the root object. After the installation is done,
+#      the show is stopped (first by calling onLeave(), then destroying
+#      the QML components).
+#
+# An image slideshow does not need to have the API defined.
+slideshowAPI: 1
+
 # Colors for text and background components.
 #
 #  - sidebarBackground is the background of the sidebar

src/modules/fstab/fstab.conf

@@ -55,7 +55,11 @@ efiMountOptions: umask=0077
 # The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
 # and does nothing for other filesystems.
 ssdExtraMountOptions:
+<<<<<<< HEAD
     btrfs: discard=async,ssd
+=======
+    btrfs: discard=async
+>>>>>>> d5a79180e7f8e1fe6ecb986c93c22857ae2888bb
 
 # Additional options added to each line in /etc/crypttab
 crypttabOptions: luks

src/modules/grubcfg/main.py

@@ -3,7 +3,7 @@
 #
 # === This file is part of Calamares - <https://calamares.io> ===
 #
-#   SPDX-FileCopyrightText: 2014-2015 Philip Müller <philm@manjaro.org>
+#   SPDX-FileCopyrightText: 2014-2015,2019-2020 Philip Müller <philm@manjaro.org>
 #   SPDX-FileCopyrightText: 2015-2017 Teo Mrnjavac <teo@kde.org>
 #   SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
 #   SPDX-FileCopyrightText: 2017 2019, Adriaan de Groot <groot@kde.org>
@@ -183,7 +183,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
     if cryptdevice_params:
         kernel_params.extend(cryptdevice_params)
 
-    if use_splash and not os.path.exists(os.path.join(root_mount_point, "usr/bin/grub-set-bootflag")):
+    if use_splash:
         kernel_params.append(use_splash)
 
     if os.path.exists(os.path.join(root_mount_point, "usr/lib/libapparmor.so")):

src/modules/partition/tests/PartitionJobTests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://calamares.io> ===
  *
  *   SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org>
+ *   SPDX-FileCopyrightText: 2018, Philip Müller <philm@manjaro.org>
  *   SPDX-FileCopyrightText: 2017, 2019 Adriaan de Groot <groot@kde.org>
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *

src/modules/postcfg/main.py

@@ -3,7 +3,7 @@
 #
 # === This file is part of Calamares - <http://github.com/calamares> ===
 #
-#   Copyright 2014 - 2019, Philip Müller <philm@manjaro.org>
+#   Copyright 2014 - 2021, Philip Müller <philm@manjaro.org>
 #   Copyright 2016, Artoo <artoo@manjaro.org>
 #
 #   Calamares is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 import libcalamares
 import subprocess
+import os
 
 from shutil import copy2
 from distutils.dir_util import copy_tree
@@ -50,13 +51,24 @@ class ConfigController:
     def terminate(self, proc):
         target_env_call(['killall', '-9', proc])
 
+    def remove_symlink(self, target):
+        for root, dirs, files in os.walk("/" + target):
+            for filename in files:
+                path = os.path.join(root, filename)
+                if os.path.islink(path):
+                    os.unlink(path)
+            for folder in dirs:
+                path = os.path.join(root, folder)
+                if os.path.islink(path):
+                    os.unlink(path)  
+
     def copy_file(self, file):
         if exists("/" + file):
             copy2("/" + file, join(self.root, file))
 
     def copy_folder(self, source, target):
         if exists("/" + source):
-            copy_tree("/" + source, join(self.root, target))
+            copy_tree("/" + source, join(self.root, target), preserve_symlinks=1)
 
     def remove_pkg(self, pkg, path):
         if exists(join(self.root, path)):
@@ -96,8 +108,8 @@ class ConfigController:
         elif cpu_ucode == "GenuineIntel":
             self.remove_pkg("amd-ucode", "boot/amd-ucode.img")
 
-        # Remove calamares
+        # Remove symlinks before copying   
-        self.remove_pkg("calamares", "usr/bin/calamares")
+        self.remove_symlink('root')
 
         # Copy skel to root
         self.copy_folder('etc/skel', 'root')
@@ -132,6 +144,10 @@ class ConfigController:
             self.rmdir("opt/mhwd")
             self.umount("etc/resolv.conf")
 
+        # Remove calamares
+        self.remove_pkg("calamares", "usr/bin/calamares")
+        self.remove_pkg("calamares-git", "usr/bin/calamares")
+
         return None