diff --git a/lubuntu/modules/before_bootloader_context.conf b/common/modules/before_bootloader_context.conf similarity index 100% rename from lubuntu/modules/before_bootloader_context.conf rename to common/modules/before_bootloader_context.conf diff --git a/lubuntu/modules/before_bootloader_mkdirs_context.conf b/common/modules/before_bootloader_mkdirs_context.conf similarity index 100% rename from lubuntu/modules/before_bootloader_mkdirs_context.conf rename to common/modules/before_bootloader_mkdirs_context.conf diff --git a/lubuntu/modules/bootloader.conf b/common/modules/bootloader.conf similarity index 100% rename from lubuntu/modules/bootloader.conf rename to common/modules/bootloader.conf diff --git a/lubuntu/modules/finished.conf b/common/modules/finished.conf similarity index 100% rename from lubuntu/modules/finished.conf rename to common/modules/finished.conf diff --git a/lubuntu/modules/fstab.conf b/common/modules/fstab.conf similarity index 100% rename from lubuntu/modules/fstab.conf rename to common/modules/fstab.conf diff --git a/lubuntu/modules/grubcfg.conf b/common/modules/grubcfg.conf similarity index 100% rename from lubuntu/modules/grubcfg.conf rename to common/modules/grubcfg.conf diff --git a/lubuntu/modules/locale.conf b/common/modules/locale.conf similarity index 100% rename from lubuntu/modules/locale.conf rename to common/modules/locale.conf diff --git a/lubuntu/modules/machineid.conf b/common/modules/machineid.conf similarity index 100% rename from lubuntu/modules/machineid.conf rename to common/modules/machineid.conf diff --git a/lubuntu/modules/mount.conf b/common/modules/mount.conf similarity index 100% rename from lubuntu/modules/mount.conf rename to common/modules/mount.conf diff --git a/lubuntu/modules/shellprocess_add386arch.conf b/common/modules/shellprocess_add386arch.conf similarity index 100% rename from lubuntu/modules/shellprocess_add386arch.conf rename to common/modules/shellprocess_add386arch.conf diff --git a/lubuntu/modules/shellprocess_bug-LP#1829805.conf b/common/modules/shellprocess_bug-LP#1829805.conf similarity index 100% rename from lubuntu/modules/shellprocess_bug-LP#1829805.conf rename to common/modules/shellprocess_bug-LP#1829805.conf diff --git a/lubuntu/modules/shellprocess_logs.conf b/common/modules/shellprocess_logs.conf similarity index 100% rename from lubuntu/modules/shellprocess_logs.conf rename to common/modules/shellprocess_logs.conf diff --git a/debian/changelog b/debian/changelog index d99dab6..237aeae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:22.10.6) kinetic; urgency=medium + + * Move much of the common modules to the common package. + + -- Simon Quigley Sun, 26 Jun 2022 22:10:37 -0500 + calamares-settings-ubuntu (1:22.10.5) kinetic; urgency=medium * Fix desktop file typo in exec line. diff --git a/debian/rules b/debian/rules index 1eafac2..b5fd664 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_missing: dh_missing mkdir -pv debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules - cp -vr common/modules/* debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules + cp -vr common/modules/automirror debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules + mkdir -pv debian/calamares-settings-ubuntu-common/etc/calamares/modules + cp -vr common/modules/*.conf debian/calamares-settings-ubuntu-common/etc/calamares/modules chmod -R 755 debian/calamares-settings-ubuntu-common/usr/lib/ chmod 644 debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules/automirror/automirror.conf chmod 644 debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules/automirror/module.desc diff --git a/ubuntustudio/modules/before_bootloader_context.conf b/ubuntustudio/modules/before_bootloader_context.conf deleted file mode 100644 index 1c6d60c..0000000 --- a/ubuntustudio/modules/before_bootloader_context.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Make sure the correct bootloader package is installed for EFI. -# Also pull in shim so secureboot has a chance at working. -# Because of edge cases, we ignore BIOS, and do the same -# procedure for all EFI types. ---- -firmwareType: - bios: "-/bin/true" - "*": - - command: apt-cdrom add -m -d=/media/cdrom/ - timeout: 10 - - command: sed -i '/deb http/d' /etc/apt/sources.list - timeout: 10 - - command: apt-get update - timeout: 120 - - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if grep -q 64 /sys/firmware/efi/fw_platform_size; then echo amd64-signed; else echo ia32; fi) - timeout: 300 - - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed - timeout: 300 diff --git a/ubuntustudio/modules/bootloader.conf b/ubuntustudio/modules/bootloader.conf deleted file mode 100644 index 6286d8e..0000000 --- a/ubuntustudio/modules/bootloader.conf +++ /dev/null @@ -1,33 +0,0 @@ ---- -efiBootLoader: "grub" - -# systemd-boot configuration files settings, set kernel and initramfs file names -# and amount of time before default selection boots -kernel: "/vmlinuz-linux" -img: "/initramfs-linux.img" -fallback: "/initramfs-linux-fallback.img" -timeout: "10" -# Optionally set the menu entry name and kernel name to use in systemd-boot. -# If not specified here, these settings will be taken from branding.desc. -# bootloaderEntryName: "Generic GNU/Linux" -# kernelLine: ", with Stable-Kernel" -# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" - -# GRUB 2 binary names and boot directory -# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. -grubInstall: "grub-install" -grubMkconfig: "grub-mkconfig" -grubCfg: "/boot/grub/grub.cfg" - -# Optionally set the bootloader ID to use for EFI. This is passed to -# grub-install --bootloader-id. -# -# If not set here, the value from bootloaderEntryName from branding.desc -# is used, with problematic characters (space and slash) replaced. -# -# The ID is also used as a directory name within the EFI environment, -# and the bootloader is copied from /boot/efi/EFI// . When -# setting the option here, take care to use only valid directory -# names since no sanitizing is done. -# -efiBootloaderId: "ubuntu" diff --git a/ubuntustudio/modules/finished.conf b/ubuntustudio/modules/finished.conf deleted file mode 100644 index 18951b3..0000000 --- a/ubuntustudio/modules/finished.conf +++ /dev/null @@ -1,3 +0,0 @@ ---- -restartNowMode: user-checked -restartNowCommand: "systemctl -i reboot" diff --git a/ubuntustudio/modules/grubcfg.conf b/ubuntustudio/modules/grubcfg.conf deleted file mode 100644 index 2714306..0000000 --- a/ubuntustudio/modules/grubcfg.conf +++ /dev/null @@ -1,3 +0,0 @@ -overwrite: false -defaults: - GRUB_ENABLE_CRYPTODISK: true diff --git a/ubuntustudio/modules/locale.conf b/ubuntustudio/modules/locale.conf deleted file mode 100644 index 51e5e15..0000000 --- a/ubuntustudio/modules/locale.conf +++ /dev/null @@ -1,8 +0,0 @@ ---- -region: "America" -zone: "New_York" -localeGenPath: "/etc/locale.gen" -geoip: - style: "xml" - url: "https://geoip.ubuntu.com/lookup" - selector: "TimeZone" diff --git a/ubuntustudio/modules/shellprocess_add386arch.conf b/ubuntustudio/modules/shellprocess_add386arch.conf deleted file mode 100644 index 3d8e2fa..0000000 --- a/ubuntustudio/modules/shellprocess_add386arch.conf +++ /dev/null @@ -1,5 +0,0 @@ ---- -dontChroot: false -timeout: 30 -script: - - command: "/usr/bin/dpkg --add-architecture i386"