some cleanup

This commit is contained in:
manuel 2024-05-26 10:48:14 +00:00
parent 937d2cd0a5
commit f80616eefa
15 changed files with 3 additions and 175 deletions

View File

@ -1,27 +0,0 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
# Configure fstab options
#
---
mountOptions:
default: defaults,noatime,nodiscard
btrfs: defaults,noatime,noautodefrag,nodiscard
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"

View File

@ -1,6 +0,0 @@
localeGenPath: "/etc/locale.gen"
geoip:
style: "json"
url: "https://ipapi.co/json"
selector: "timezone"

View File

@ -1,38 +0,0 @@
# 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
mountPoint: /proc
- device: sys
fs: sysfs
mountPoint: /sys
- device: /dev
mountPoint: /dev
options: bind
- device: tmpfs
fs: tmpfs
mountPoint: /run
- device: /run/udev
mountPoint: /run/udev
options: bind
extraMountsEfi:
- device: efivarfs
fs: efivarfs
mountPoint: /sys/firmware/efi/efivars
btrfsSubvolumes:
- mountPoint: /
subvolume: /@
- mountPoint: /home
subvolume: /@home
- mountPoint: /var/cache
subvolume: /@cache
- mountPoint: /var/log
subvolume: /@log

View File

@ -1,20 +0,0 @@
# Auto generated descriptions from netinstall-packages
- name: " Select your init systems "
description: "Choose an init system"
critical: false
selected: false
hidden: false
expanded: true
subgroups:
- name: " sysvinit-core"
description: " System-V-like init"
packages:
- sysvinit-core
- name: " runit-init"
description: " system-wide service supervision (as init system)"
packages:
- runit-init
- name: " openrc"
description: " dependency based service manager (runlevel change mechanism)"
packages:
- openrc

View File

@ -1,15 +0,0 @@
backend: apt
operations:
- remove:
- 'live-boot'
- 'live-boot-doc'
- 'live-config'
- 'live-config-doc'
- 'live-config-systemd'
- 'live-config-systemd'
- 'live-tools'
- 'live-task-localisation'
- 'live-task-recommended'
- 'calamares-settings-debian'
- 'calamares'

View File

@ -1,16 +0,0 @@
#!/bin/sh
###
# Wrapper for running calamares on Peppermint live media
###
# Stale file left behind by live-build that messes with partitioning
sudo mv /etc/fstab /etc/fstab.orig.calamares
# Access control to run calamares as root for xwayland
#xhost +si:localuser:root
pkexec calamares
#pkexec calamares --debug | sudo tee /var/log/Calamares-Install.log
xhost -si:localuser:root
# Restore stale fstab, for what it's worth
sudo mv /etc/fstab.orig.calamares /etc/fstab

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "bootloader-config"
interface: "process"
command: "/usr/sbin/bootloader-config"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "dpkg-unsafe-io-undo"
interface: "process"
command: "/usr/sbin/dpkg-unsafe-io -u"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "dpkg-unsafe-io"
interface: "process"
command: "/usr/sbin/dpkg-unsafe-io"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "grub-defaults"
interface: "process"
command: "/usr/sbin/grub-defaults"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "sources-final"
interface: "process"
command: "/usr/sbin/sources-final"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "sources-media-unmount"
interface: "process"
command: "/usr/sbin/sources-media -u"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "sources-media"
interface: "process"
command: "/usr/sbin/sources-media"
timeout: 600

View File

@ -1,6 +0,0 @@
---
type: "job"
name: "update-system"
interface: "process"
command: "/usr/sbin/update-system"
timeout: 600

View File

@ -435,7 +435,7 @@ def shared_folders():
'/pmostools',
'/autostart',
'/pylibraries'
)
)
des_paths =('/usr/share/plymouth/themes/joy',
'/usr/share/applications',
'/usr/share/fonts/pepconf',
@ -451,8 +451,7 @@ def shared_folders():
'/etc/skel/.local/share/pmostools',
'/etc/skel/.config/autostart',
'/usr/lib/python3/dist-packages'
)
)
src_q = collections.deque(src_paths)
des_q = collections.deque(des_paths)
size_q = len(des_q)
@ -547,8 +546,7 @@ def shared_files():
'/lightdm/lightdm-gtk-greeter.conf',
'/plymouth/plymouthd.conf',
#'/packages/deb-multimedia-keyring_2016.8.1_all.deb',
# '/repo_public_key/trusted.gpg',
#'/repo_public_key/trusted.gpg',
)
des_paths = ('/etc/skel/.bash_aliases',
'/etc/apt/sources.list.d',