ben/silverblue-images
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updating gpg-pubkey count on both asrock and lenovo

Browse Source
This commit is contained in:
Ben Radey
2026-05-07 15:24:36 -04:00
parent 91d8510579
commit 3e7c16ad95
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Containerfile-asrock-x570
+2 -2
View File
@@ -10,11 +10,11 @@ RUN echo "%_without_kmod_nvidia_detect 1" > /etc/rpm/macros.nvidia-kmod && \
chmod 777 /var/tmp && \ chmod 777 /var/tmp && \
/usr/sbin/akmods --force --kernels "$(rpm -qa kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" /usr/sbin/akmods --force --kernels "$(rpm -qa kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
# The first check makes sure that we have exactly 4 gpg pubkeys trusted in the rpmdb (the ones from the base image). # The first check makes sure that we have exactly 10 gpg pubkeys trusted in the rpmdb (the ones manually imported above) (Brave adds 6, apparently?).
# Any more than that means that dnf automatically added a new one, which is shady! # Any more than that means that dnf automatically added a new one, which is shady!
# Then: cleanup image for linting # Then: cleanup image for linting
# Finally: verify image is good # Finally: verify image is good
# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed # FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
RUN [[ 4 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ RUN [[ 10 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \ rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings --skip nonempty-run-tmp bootc container lint --fatal-warnings --skip nonempty-run-tmp
Containerfile-lenovo-16arh7h
+2 -2
View File
@@ -24,11 +24,11 @@ RUN git clone https://github.com/johnfanv2/LenovoLegionLinux.git && \
echo legion-laptop > /etc/modules-load.d/legion_laptop.conf && \ echo legion-laptop > /etc/modules-load.d/legion_laptop.conf && \
rm -rf LenovoLegionLinux rm -rf LenovoLegionLinux
# The first check makes sure that we have exactly 4 gpg pubkeys trusted in the rpmdb (the ones from the base image). # The first check makes sure that we have exactly 10 gpg pubkeys trusted in the rpmdb (the ones manually imported above) (Brave adds 6, apparently?).
# Any more than that means that dnf automatically added a new one, which is shady! # Any more than that means that dnf automatically added a new one, which is shady!
# Then: cleanup image for linting # Then: cleanup image for linting
# Finally: verify image is good # Finally: verify image is good
# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed # FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
RUN [[ 4 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ RUN [[ 10 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \ rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings --skip nonempty-run-tmp bootc container lint --fatal-warnings --skip nonempty-run-tmp