feat: move back image specific files/hacks/tech debt (#1472)
* feat: move back rpm-ostreed.conf This is tech debt only for this repo and is not an "asset" shared between multiple aurora variants. * feat: add bootc install config CentOS Stream doesn't support BTRFS out of the box * feat: add dracut/modprobe configs module enablement is not an asset and should not be shared between variants * feat: add stuff for preinstall bazaar flatpak back we don't need this on LTS as we start fresh there, this is not an "asset" * feat: add SDDM stuff Plasma Login Manager is the future and we shouldn't introduce workarounds on other Aurora variants when there is a fix in sight. * feat: add flatpak-nuke-fedora.service We only have to deal with this problem on Fedora bases * fix: actually COPY system_files * Update system_files/shared/etc/rpm-ostreed.conf Co-authored-by: Adam Fidel <ledif@users.noreply.github.com> * chore: remove dracut zstd compression * chore: move dracut config to command --------- Co-authored-by: Adam Fidel <ledif@users.noreply.github.com>
This commit is contained in:
renner
GitHub
parent
18873db729
commit
32a66fc719
10 changed files with 97 additions and 1 deletions
|
|
@ -17,6 +17,9 @@ COPY --from=common /logos /logos
|
|||
COPY --from=common /system_files /system_files
|
||||
COPY --from=common /wallpapers /system_files/shared
|
||||
|
||||
# Overwrite files from common if necessary
|
||||
COPY /system_files /system_files
|
||||
|
||||
## aurora image section
|
||||
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ KERNEL_VERSION=$(rpm -q --queryformat="%{evr}.%{arch}" kernel-core)
|
|||
|
||||
# Ensure Initramfs is generated
|
||||
export DRACUT_NO_XATTR=1
|
||||
/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v --add ostree -f "/lib/modules/${KERNEL_VERSION}/initramfs.img"
|
||||
/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v --add "ostree fido2 tpm2-tss pkcs11 pcsc" -f "/lib/modules/${KERNEL_VERSION}/initramfs.img"
|
||||
chmod 0600 "/lib/modules/${KERNEL_VERSION}/initramfs.img"
|
||||
|
||||
echo "::endgroup::"
|
||||
|
|
|
|||
17
system_files/shared/etc/rpm-ostreed.conf
Normal file
17
system_files/shared/etc/rpm-ostreed.conf
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
# Entries in this file show the compile time defaults.
|
||||
# You can change settings by editing this file.
|
||||
# For option meanings, see rpm-ostreed.conf(5).
|
||||
|
||||
[Daemon]
|
||||
AutomaticUpdatePolicy=stage
|
||||
|
||||
##########
|
||||
# NOTE: There are plans to set to true by default in the future
|
||||
#
|
||||
# Set this to false to enable local layering with dnf
|
||||
# This is an unsupported configuration that can lead to upgrade isses
|
||||
# Be careful when setting this to true
|
||||
#
|
||||
# See [future link] for more information
|
||||
##########
|
||||
# LockLayering=false
|
||||
2
system_files/shared/usr/lib/bootc/install/20-aurora.toml
Normal file
2
system_files/shared/usr/lib/bootc/install/20-aurora.toml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
[install]
|
||||
root-fs-type = "btrfs"
|
||||
6
system_files/shared/usr/lib/modprobe.d/amd-legacy.conf
Normal file
6
system_files/shared/usr/lib/modprobe.d/amd-legacy.conf
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
# Enable Legacy AMD hardware support
|
||||
options amdgpu si_support=1
|
||||
options amdgpu cik_support=1
|
||||
|
||||
options radeon si_support=0
|
||||
options radeon cik_support=0
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
[Unit]
|
||||
Description=Remove Fedora flatpak repositories
|
||||
Before=flatpak-preinstall.service
|
||||
Before=flatpak-system-helper.service
|
||||
# Make sure we run before the Fedora service if it exists
|
||||
Before=flatpak-add-fedora-repos.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/bin/flatpak remote-delete --system fedora
|
||||
ExecStart=/usr/bin/flatpak remote-delete --system fedora-testing
|
||||
# Make sure even if flatpak-add-fedora-repos.service exists, it
|
||||
# won't run.
|
||||
ExecStart=/usr/bin/touch /var/lib/flatpak/.fedora-initialized
|
||||
# Flatpak will fail if the remote doesn't exist, but we don't mind
|
||||
SuccessExitStatus=1
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
[Unit]
|
||||
Description=Preinstall Flatpaks
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
ConditionPathExists=/usr/bin/flatpak
|
||||
Documentation=man:flatpak-preinstall(1)
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/flatpak preinstall -y
|
||||
RemainAfterExit=true
|
||||
Restart=on-failure
|
||||
RestartSec=30
|
||||
|
||||
StartLimitIntervalSec=600
|
||||
StartLimitBurst=3
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# Workaround to allow KDE Discover to install sddm themes
|
||||
# TODO: Remove this whenever sddm allows installing themes other than in /usr/share.
|
||||
# See https://github.com/sddm/sddm/issues/1561
|
||||
|
||||
[Unit]
|
||||
Description=KDE writable sddm workaround
|
||||
RequiresMountsFor=/usr /var
|
||||
ConditionPathExists=/usr/share/sddm
|
||||
ConditionPathExists=/var/sddm_themes/themes
|
||||
ConditionPathExists=/var/sddm_themes/themes.work
|
||||
PartOf=aurora-kde-themes-workaround.target
|
||||
|
||||
[Mount]
|
||||
Type=overlay
|
||||
What=overlay
|
||||
Where=/usr/share/sddm/themes
|
||||
Options=lowerdir=/usr/share/sddm/themes,upperdir=/var/sddm_themes/themes,workdir=/var/sddm_themes/themes.work
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
# Workaround to allow KDE Discover to install sddm themes
|
||||
# TODO: Remove this whenever sddm allows installing themes other than in /usr/share.
|
||||
# See https://github.com/sddm/sddm/issues/1561
|
||||
|
||||
d /var/sddm_themes/themes 0755 - - -
|
||||
d /var/sddm_themes/themes.work 0755 - - -
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
[Flatpak Preinstall io.github.kolunmi.Bazaar]
|
||||
Branch=stable
|
||||
IsRuntime=false
|
||||
Loading…
Reference in a new issue