thefossguy/asahi-kiwi-descriptions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework the selinux relabel workaround

Browse Source
This commit is contained in:
Davide Cavalca 2023-06-19 19:21:37 +00:00
parent 1f96cd2af0
commit 9b185dae8a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.sh
View File

@ -93,12 +93,6 @@ rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
# Note that running rpm recreates the rpm db files which aren't needed or wanted # Note that running rpm recreates the rpm db files which aren't needed or wanted
rm -f /var/lib/rpm/__db* rm -f /var/lib/rpm/__db*
#======================================
# Force selinux relabel on firstboot
#--------------------------------------
# Workaround for https://github.com/OSInside/kiwi/issues/2192
touch /.autorelabel
#====================================== #======================================
# Generate boot.bin # Generate boot.bin
#====================================== #======================================

7
root/etc/fstab.script
View File

@ -1,3 +1,10 @@
#!/bin/sh #!/bin/sh
# Set ESP mount options to match what Fedora does
# https://github.com/OSInside/kiwi/issues/2201
gawk -i inplace '$2 == "/boot/efi" { $4 = $4",umask=0077,shortname=winnt" } { print $0 }' /etc/fstab gawk -i inplace '$2 == "/boot/efi" { $4 = $4",umask=0077,shortname=winnt" } { print $0 }' /etc/fstab
# Run selinux relabel at the right time
# https://github.com/OSInside/kiwi/issues/2192
# https://github.com/OSInside/kiwi/pull/2282#issuecomment-1514399308
setfiles -F -p -c /etc/selinux/targeted/policy/policy.* -e /proc -e /sys -e /dev /etc/selinux/targeted/contexts/files/file_contexts /