update calamares configs
This commit is contained in:
parent
417b4efe45
commit
7e59740468
|
|
@ -230,6 +230,7 @@ cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm
|
|||
cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -221,6 +221,7 @@ cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
|||
cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm
|
|||
cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -233,6 +233,7 @@ cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel
|
|||
cp $acorbuild/acorconfigs/kde/.gtkrc-2.0 $acorbuild/build/config/includes.chroot/etc/skel
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm
|
|||
cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel
|
||||
cp $acorbuild/acorconfigs/.gtkrc-2.0 $acorbuild/build/config/includes.chroot/etc/skel
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel
|
|||
cp $acorbuild/acorconfigs/.gtkrc-2.0 $acorbuild/build/config/includes.chroot/etc/skel
|
||||
cp $acorbuild/acorinstaller/bootloader-config-32/* $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@ cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm
|
|||
cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
|||
cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel
|
||||
cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -219,6 +219,7 @@ cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default
|
|||
cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel
|
||||
cp $acorbuild/acorinstaller/bootloader-config-32/* $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/install-debian $acorbuild/build/config/includes.chroot/usr/bin
|
||||
cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin
|
||||
|
||||
cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ efiBootMgr: "efibootmgr"
|
|||
# setting the option here, keep in mind that the name is sanitized
|
||||
# (problematic characters, see above, are replaced).
|
||||
#
|
||||
# efiBootloaderId: "dirname"
|
||||
efiBootloaderId: "acoros"
|
||||
|
||||
# Optionally install a copy of the GRUB EFI bootloader as the EFI
|
||||
# fallback loader (either bootia32.efi or bootx64.efi depending on
|
||||
|
|
@ -51,4 +51,4 @@ efiBootMgr: "efibootmgr"
|
|||
# seems to be the only one). If you set this to false, take care
|
||||
# to add another module to optionally install the fallback on those
|
||||
# boards that need it.
|
||||
installEFIFallback: false
|
||||
installEFIFallback: true
|
||||
|
|
|
|||
|
|
@ -1,11 +1,33 @@
|
|||
# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
#
|
||||
# Configure fstab options
|
||||
#
|
||||
---
|
||||
mountOptions:
|
||||
default: defaults,noatime
|
||||
btrfs: defaults,noatime,space_cache,autodefrag
|
||||
ssdExtraMountOptions:
|
||||
ext4: discard
|
||||
jfs: discard
|
||||
xfs: discard
|
||||
swap: discard
|
||||
btrfs: discard,compress=lzo
|
||||
default: defaults,noatime,discard
|
||||
btrfs: defaults,noatime,noautodefrag,discard
|
||||
btrfs_swap: defaults
|
||||
swap: defaults
|
||||
|
||||
crypttabOptions: luks,keyscript=/bin/cat
|
||||
|
||||
efiMountOptions: umask=0077
|
||||
|
||||
ssdExtraMountOptions:
|
||||
btrfs: ssd
|
||||
|
||||
tmpOptions:
|
||||
default:
|
||||
tmpfs: false
|
||||
options: ""
|
||||
ssd:
|
||||
tmpfs: true
|
||||
options: "defaults,noatime,mode=1777"
|
||||
|
||||
- name: swap
|
||||
fstype: swap
|
||||
mountpoint: swap
|
||||
size: 4G
|
||||
create: true
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,10 @@
|
|||
# Mount filesystems in the target (generally, before treating the
|
||||
# target as a usable chroot / "live" system). Filesystems are
|
||||
# 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)
|
||||
# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
#
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
#
|
||||
# Configuration file for opendmcryptcfg module
|
||||
#
|
||||
---
|
||||
configFilePath: /etc/conf.d/dmcrypt
|
||||
|
|
@ -1,13 +1,17 @@
|
|||
efiSystemPartition: "/boot/efi"
|
||||
efiSystemPartitionSize: 600M
|
||||
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
|
||||
drawNestedPartitions: true
|
||||
defaultFileSystemType: "ext4"
|
||||
availableFileSystemTypes: ["ext4","btrfs", "f2fs","xfs"]
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@ defaultGroups:
|
|||
- lpadmin
|
||||
- scanner
|
||||
- bluetooth
|
||||
- sambashare
|
||||
autologinGroup: autologin
|
||||
doAutologin: false
|
||||
sudoersGroup: sudo
|
||||
setRootPassword: false
|
||||
setRootPassword: true
|
||||
doReusePassword: true
|
||||
allowWeakPasswords: true
|
||||
allowWeakPasswordsDefault: true
|
||||
userShell: /bin/bash
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
showSupportUrl: true
|
||||
showKnownIssuesUrl: true
|
||||
showReleaseNotesUrl: true
|
||||
showSupportUrl: false
|
||||
showKnownIssuesUrl: false
|
||||
showReleaseNotesUrl: false
|
||||
|
||||
requirements:
|
||||
requiredStorage: 10
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
###
|
||||
# Wrapper for running calamares on Debian live media
|
||||
###
|
||||
|
||||
# Stale file left behind by live-build that messes with partitioning
|
||||
sudo mv /etc/fstab /etc/fstab.orig.calamares
|
||||
|
||||
# Allow Calamares to scale the window for hidpi displays
|
||||
# This is fixed in the Calamares 3.3.0 series, so we can remove this
|
||||
# once we switch to that
|
||||
# Upstream commit that will make this obsolete:
|
||||
# https://github.com/calamares/calamares/commit/e9f011b686a0982fb7828e8ac02a8e0784d3b11f
|
||||
# Upstream bug:
|
||||
# https://github.com/calamares/calamares/issues/1945
|
||||
# Debian bug:
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992162
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=1
|
||||
|
||||
# Access control to run calamares as root for xwayland
|
||||
xhost +si:localuser:root
|
||||
pkexec calamares -d
|
||||
xhost -si:localuser:root
|
||||
|
||||
# Restore stale fstab, for what it's worth
|
||||
sudo mv /etc/fstab.orig.calamares /etc/fstab
|
||||
Loading…
Reference in New Issue