atualizar os modulos do calamares na versao Ubuntu

my-distro-debian-32-pae/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-debian-32/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-debian-64/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-devuan-32-pae/BldHelper.sh

@@ -48,4 +48,3 @@ lb clean
 # Remove the "fusato" directory and its contents
 cd ..
 rm -rf build
-

my-distro-devuan-32-pae/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./..build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-devuan-32/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-devuan-64/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-ubuntu-64/BldHelper.sh

@@ -48,4 +48,3 @@ lb clean
 # Remove the "fusato" directory and its contents
 cd ..
 rm -rf build
-

my-distro-ubuntu-64/build.sh

@@ -18,7 +18,7 @@ build="$(pwd)"
 [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build
 cd build
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
-for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
+for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.

my-distro-ubuntu-64/calamares/modules/fstab.conf

@@ -1,11 +1,27 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configure fstab options
+#
 ---
 mountOptions:
-    default: defaults,noatime
+    default: defaults,noatime,nodiscard
-    btrfs: defaults,noatime,space_cache,autodefrag
+    btrfs: defaults,noatime,noautodefrag,nodiscard
-ssdExtraMountOptions:
+    btrfs_swap: defaults
-    ext4: discard
+    swap: defaults
-    jfs: discard
+
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
 crypttabOptions: luks,keyscript=/bin/cat
+
+efiMountOptions: umask=0077
+
+ssdExtraMountOptions:
+    btrfs: ssd
+
+tmpOptions:
+    default:
+        tmpfs: false
+        options: ""
+    ssd:
+        tmpfs: true
+        options: "defaults,noatime,mode=1777"
+

my-distro-ubuntu-64/calamares/modules/mount.conf

@@ -1,18 +1,10 @@
-# Mount filesystems in the target (generally, before treating the
+# SPDX-FileCopyrightText: no
-# target as a usable chroot / "live" system). Filesystems are
+# SPDX-License-Identifier: CC0-1.0
-# automatically mounted from the partitioning module. Filesystems
-# listed here are **extra**. The filesystems listed in *extraMounts*
-# are mounted in all target systems. The filesystems listed in
-# *extraMountsEfi* are mounted in the target system **only** if
-# the host machine uses UEFI.
----
-# Extra filesystems to mount. The key's value is a list of entries; each
-# entry has four keys:
-#   - device    The device node to mount
-#   - fs        The filesystem type to use
-#   - mountPoint Where to mount the filesystem
-#   - options (optional) Extra options to pass to mount(8)
 #
+# Mount filesystems in the target (generally, before treating the
+# target as a usable chroot / "live" system).
+---
+
 extraMounts:
     - device: proc
       fs: proc
@@ -29,8 +21,18 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: bind
-
-extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
+
+btrfsSwapSubvol: /@swap
+
+btrfsSubvolumes:
+    - mountPoint: /
+      subvolume: /@
+    - mountPoint: /home
+      subvolume: /@home
+    - mountPoint: /var/cache
+      subvolume: /@cache
+    - mountPoint: /var/log
+      subvolume: /@log

my-distro-ubuntu-64/calamares/modules/openrcdmcryptcfg.conf

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration file for opendmcryptcfg module
+#
+---
+configFilePath: /etc/conf.d/dmcrypt

my-distro-ubuntu-64/calamares/modules/partition.conf

@@ -1,10 +1,15 @@
 efiSystemPartition:     "/boot/efi"
+efiSystemPartitionSize:     800M
+efiSystemPartitionName:     EFI
 userSwapChoices:
     - none      # Create no swap, use no swap
     - small     # Up to 4GB
     - suspend   # At least main memory size
     - file      # To swap file instead of partition
+swapPartitionName: SWAP
+drawNestedPartitions: false
 alwaysShowPartitionLabels: true
+allowManualPartitioning: true
 initialPartitioningChoice: erase
 initialSwapChoice: none
 defaultFileSystemType:  "ext4"

my-distro-ubuntu-64/calamares/modules/services-systemd.conf

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Systemd services manipulation.
+#
+# This module can enable services, timers and targets for systemd
+# (if packaging doesn't already do that). It can also
+# disable services and targets as well as mask units.
+
+timers:
+   - name: "fstrim"
+     mandatory: false
+

my-distro-ubuntu-64/calamares/modules/users.conf

@@ -14,5 +14,10 @@ defaultGroups:
     - bluetooth
     - sambashare
 autologinGroup:  autologin
+doAutologin:     false
 sudoersGroup:    sudo
 setRootPassword: true
+doReusePassword: true
+allowWeakPasswords: true
+allowWeakPasswordsDefault: true
+userShell: /bin/bash