diff options
| author | 2022-08-20 16:25:30 -0400 | |
|---|---|---|
| committer | 2022-08-20 16:27:52 -0400 | |
| commit | ac9451ca69c04b41ad03193a49b357da0173dbb1 (patch) | |
| tree | 08edd87adbb493806050fad3c403e937bf9de8b4 | |
| parent | c018c3342e91ee5ece4a58152b3a7acf35575d38 (diff) | |
Switch from debian-installer to calamares.
This also makes it easier to switch between stable, stable+backports, testing, and unstable.
Also included are some customizations to calamares-settings-debian, it's cleaner here and
easier to keep in sync with calamares-settings-debian if it's not a full fork.
* displaymanager.conf: Modified to only run on lightdm, don't reset the default user session.
* packages.conf: Add calamares and gparted to the list of packages to remove post-install.
* welcome.conf: Lower disk space needed from 10G to 3G, this is mostly useful for VMS.
* sources-(final,media): Don't overwrite default sources.list. The one shipped is the
release that the ISO was built against, and has all the sections (-security, -backports)
needed in case of stable builds too after the following commit.
If switching back, due to a regression in live-build --parent-debian-installer-distribution
must also be set to 'daily'.
| -rwxr-xr-x | auto/config | 5 | ||||
| -rw-r--r-- | config/includes.chroot/etc/calamares/modules/displaymanager.conf | 7 | ||||
| -rw-r--r-- | config/includes.chroot/etc/calamares/modules/packages.conf | 15 | ||||
| -rw-r--r-- | config/includes.chroot/etc/calamares/modules/welcome.conf | 17 | ||||
| -rwxr-xr-x | config/includes.chroot/usr/sbin/sources-final | 2 | ||||
| -rwxr-xr-x | config/includes.chroot/usr/sbin/sources-media | 2 | ||||
| -rw-r--r-- | config/package-lists/live.list.chroot | 4 |
7 files changed, 47 insertions, 5 deletions
diff --git a/auto/config b/auto/config index 33f2490..8b1fa45 100755 --- a/auto/config +++ b/auto/config @@ -33,11 +33,11 @@ eval set -- "$temp" case "$arch" in amd64) - lb_opts="$lb_opts --debian-installer live" + lb_opts="$lb_opts --debian-installer none" lb_opts="$lb_opts --linux-flavours amd64" ;; i386) - lb_opts="$lb_opts --debian-installer live" + lb_opts="$lb_opts --debian-installer none" lb_opts="$lb_opts --linux-flavours 686-pae" ;; armel|armhf) @@ -51,7 +51,6 @@ esac lb config noauto \ --archive-areas "main contrib non-free-firmware non-free" \ --bootappend-live "boot=live quiet splash" \ - --debian-installer-distribution daily \ --distribution "$dist" \ --firmware-binary true \ --firmware-chroot true \ diff --git a/config/includes.chroot/etc/calamares/modules/displaymanager.conf b/config/includes.chroot/etc/calamares/modules/displaymanager.conf new file mode 100644 index 0000000..70c7d35 --- /dev/null +++ b/config/includes.chroot/etc/calamares/modules/displaymanager.conf @@ -0,0 +1,7 @@ +--- +displaymanagers: + - lightdm + +defaultDesktopEnvironment: + executable: "startxfce4" + desktopFile: "xebian" diff --git a/config/includes.chroot/etc/calamares/modules/packages.conf b/config/includes.chroot/etc/calamares/modules/packages.conf new file mode 100644 index 0000000..42258b5 --- /dev/null +++ b/config/includes.chroot/etc/calamares/modules/packages.conf @@ -0,0 +1,15 @@ +backend: apt + +operations: + - remove: + - 'calamares' + - 'calamares-settings-debian' + - 'gparted' + - 'live-boot' + - 'live-boot-doc' + - 'live-config' + - 'live-config-doc' + - 'live-config-systemd' + - 'live-task-localisation' + - 'live-task-recommended' + - 'live-tools' diff --git a/config/includes.chroot/etc/calamares/modules/welcome.conf b/config/includes.chroot/etc/calamares/modules/welcome.conf new file mode 100644 index 0000000..097253b --- /dev/null +++ b/config/includes.chroot/etc/calamares/modules/welcome.conf @@ -0,0 +1,17 @@ +--- +showSupportUrl: true +showKnownIssuesUrl: true +showReleaseNotesUrl: true + +requirements: + requiredStorage: 3 + requiredRam: 1.0 + check: + - storage + - ram + - power + - root + required: + - storage + - ram + - root diff --git a/config/includes.chroot/usr/sbin/sources-final b/config/includes.chroot/usr/sbin/sources-final new file mode 100755 index 0000000..039e4d0 --- /dev/null +++ b/config/includes.chroot/usr/sbin/sources-final @@ -0,0 +1,2 @@ +#!/bin/sh +exit 0 diff --git a/config/includes.chroot/usr/sbin/sources-media b/config/includes.chroot/usr/sbin/sources-media new file mode 100755 index 0000000..039e4d0 --- /dev/null +++ b/config/includes.chroot/usr/sbin/sources-media @@ -0,0 +1,2 @@ +#!/bin/sh +exit 0 diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index f60b2b5..25cf9c6 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,5 +1,5 @@ +calamares-settings-debian +gparted live-boot live-config live-config-systemd -dbus -gparted |
