Skip to content

Commit

Permalink
chore: remove alternatives workarounds (LMK if they are still required)
Browse files Browse the repository at this point in the history
  • Loading branch information
p5 committed Nov 1, 2024
1 parent ac024e0 commit e51b750
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
11 changes: 5 additions & 6 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=config,src=/rpms,dst=/tmp/rpms \
--mount=type=bind,from=akmods,src=/rpms/ublue-os,dst=/tmp/akmods-rpms \
--mount=type=bind,from=kernel,src=/tmp/rpms,dst=/tmp/kernel-rpms \
mkdir -p /var/lib/alternatives && \
chmod +x /ctx/build_scripts/*.sh && \
for script in /ctx/build_scripts/*.sh; do $script; done && \
ostree container commit && \
mkdir -p /var/lib && mv /staged-alternatives /var/lib/alternatives && \
mkdir -p /var/tmp && \
chmod -R 1777 /var/tmp
for script in /ctx/build_scripts/*.sh; do $script; done \
&& \
rpm-ostree cleanup -m && \
rm -rf /tmp/* /var/* && \
ostree container commit
5 changes: 5 additions & 0 deletions build_scripts/000-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/bash

set -ouex pipefail

mkdir -p /var/lib/alternatives
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/bash

set -ouex pipefail
set -eoux pipefail

rm -f /usr/bin/chsh
rm -f /usr/bin/lchsh

# prevent gnome software from warning about dkms secureboot as these warnings
# would duplicate warnings provided by ublue already. we don't want confusion
Expand Down
6 changes: 0 additions & 6 deletions build_scripts/007-remove-footguns.sh

This file was deleted.

2 changes: 0 additions & 2 deletions build_scripts/998-post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ ln -s "/usr/share/fonts/google-noto-sans-cjk-fonts" "/usr/share/fonts/noto-cjk"

rm -f /etc/yum.repos.d/_copr_ublue-os_staging.repo
rm -f /etc/yum.repos.d/_copr_kylegospo_oversteer.repo

mv /var/lib/alternatives /staged-alternatives

0 comments on commit e51b750

Please sign in to comment.