From 3bfd2f6c285d4cd93b84642e140a3b1c36b17e7e Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Sat, 6 Aug 2022 20:09:00 -0700 Subject: [PATCH] Update from diffs --- debian/changelog | 12 ++++++++++++ lubuntu/modules/fstab.conf | 2 +- lubuntu/modules/mount.conf | 3 +++ lubuntu/modules/packages.conf | 1 + ubuntustudio/modules/fstab.conf | 2 +- ubuntustudio/modules/mount.conf | 3 +++ ubuntustudio/modules/packages.conf | 1 + 7 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e279c6d..0ac0696 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +calamares-settings-ubuntu (1:22.04.4.2) jammy; urgency=medium + + * Fixed LibreOffice localization bug (LP: #1970270) + + -- Aaron Rainbolt Fri, 05 Aug 2022 17:26:33 -0500 + +calamares-settings-ubuntu (1:22.04.4.1) jammy; urgency=medium + + * Fixed BTRFS installation bug (LP: #1966774). + + -- Aaron Rainbolt Sun, 24 Jul 2022 14:37:49 -0500 + calamares-settings-ubuntu (1:22.04.4) jammy; urgency=medium * Change calamares to use Ubuntu Studio Light colors diff --git a/lubuntu/modules/fstab.conf b/lubuntu/modules/fstab.conf index ae14a2b..2f4a016 100644 --- a/lubuntu/modules/fstab.conf +++ b/lubuntu/modules/fstab.conf @@ -1,6 +1,6 @@ mountOptions: default: defaults - btrfs: defaults,noatime,space_cache,autodefrag + btrfs: defaults,noatime,autodefrag ssdExtraMountOptions: ext4: discard jfs: discard diff --git a/lubuntu/modules/mount.conf b/lubuntu/modules/mount.conf index 1efd5dd..048988a 100644 --- a/lubuntu/modules/mount.conf +++ b/lubuntu/modules/mount.conf @@ -14,6 +14,9 @@ extraMounts: - device: /run/udev mountPoint: /run/udev options: bind + - device: /run/systemd/resolve + mountPoint: /run/systemd/resolve + options: bind extraMountsEfi: - device: efivarfs diff --git a/lubuntu/modules/packages.conf b/lubuntu/modules/packages.conf index 8be1e16..f127898 100644 --- a/lubuntu/modules/packages.conf +++ b/lubuntu/modules/packages.conf @@ -12,3 +12,4 @@ operations: - language-pack-$LOCALE - hunspell-$LOCALE - libreoffice-help-$LOCALE + - libreoffice-l10n-$LOCALE diff --git a/ubuntustudio/modules/fstab.conf b/ubuntustudio/modules/fstab.conf index ae14a2b..2f4a016 100644 --- a/ubuntustudio/modules/fstab.conf +++ b/ubuntustudio/modules/fstab.conf @@ -1,6 +1,6 @@ mountOptions: default: defaults - btrfs: defaults,noatime,space_cache,autodefrag + btrfs: defaults,noatime,autodefrag ssdExtraMountOptions: ext4: discard jfs: discard diff --git a/ubuntustudio/modules/mount.conf b/ubuntustudio/modules/mount.conf index 1efd5dd..048988a 100644 --- a/ubuntustudio/modules/mount.conf +++ b/ubuntustudio/modules/mount.conf @@ -14,6 +14,9 @@ extraMounts: - device: /run/udev mountPoint: /run/udev options: bind + - device: /run/systemd/resolve + mountPoint: /run/systemd/resolve + options: bind extraMountsEfi: - device: efivarfs diff --git a/ubuntustudio/modules/packages.conf b/ubuntustudio/modules/packages.conf index d1c980f..d94c009 100644 --- a/ubuntustudio/modules/packages.conf +++ b/ubuntustudio/modules/packages.conf @@ -11,3 +11,4 @@ operations: - language-pack-$LOCALE - hunspell-$LOCALE - libreoffice-help-$LOCALE + - libreoffice-l10n-$LOCALE