Skip to content

Commit 36b2761

Browse files
authored
Dracut: Update Dracut overlay module to correctly locate 'chcon' (#11986)
1 parent d0a0f82 commit 36b2761

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

SPECS/dracut/90overlayfs/azl-configure-selinux.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ if [ -n "$overlayfs" ]; then
2828
echo "root folder label : ($contextType)"
2929

3030
# Set the type on the target folders
31-
[ -e /sysroot ] && chcon -t $contextType /sysroot
32-
[ -e /run/overlayfs ] && chcon -t $contextType /run/overlayfs
33-
[ -e /run/ovlwork ] && chcon -t $contextType /run/ovlwork
31+
CHCON_TOOL=$NEWROOT/usr/bin/chcon
32+
[ -e /sysroot ] && $CHCON_TOOL -t $contextType /sysroot
33+
[ -e /run/overlayfs ] && $CHCON_TOOL -t $contextType /run/overlayfs
34+
[ -e /run/ovlwork ] && $CHCON_TOOL -t $contextType /run/ovlwork
3435
fi

SPECS/dracut/dracut.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"00-vrf.conf": "e2885a4b090d8ca3771e60ce6dcd8b849e28ce5002a5c7b71ff796a92deb2810",
77
"00-xen.conf": "8b7a89b7716cb40a9c0d681caed6994d81ff4dfad4fe50cea15cd47b885dc5a6",
88
"50-noxattr.conf": "61d95f05890ac6ee3355d0a386dd5645d82b7a4202d90305d997fd18c6d139dd",
9-
"azl-configure-selinux.sh": "5f526509910fccdc2dffad4ef5070740847195510e3faefff39b831c9d28a439",
9+
"azl-configure-selinux.sh": "a32da2e920348a5f991d6c418873a0a761f6e4bd926bb17a43cdb2c28b4f21d6",
1010
"azl-liveos-artifacts-download.service": "888be8c82297cccd510d7f963611c2360ae67559826b2b474da6d9935237de64",
1111
"azl-liveos-artifacts-download.sh": "f21dc68de8c81d8a8128e7a9d7be45d25978f0b5e47a4cf1a2d97b1e171ec045",
1212
"dracut-102.tar.gz": "601b175cbf4d2ee902bb7bda3af8826ae2ca060c1af880f6da5a833413f4ec70",

SPECS/dracut/dracut.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: dracut to create initramfs
55
Name: dracut
66
Version: 102
7-
Release: 10%{?dist}
7+
Release: 11%{?dist}
88
# The entire source code is GPLv2+
99
# except install/* which is LGPLv2+
1010
License: GPLv2+ AND LGPLv2+
@@ -315,6 +315,9 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
315315
%dir %{_sharedstatedir}/%{name}/overlay
316316

317317
%changelog
318+
* Mon Mar 05 2025 George Mileka <[email protected]> - 102-11
319+
- Update overlayfs selinux handling with the full path of chcon
320+
318321
* Tue Feb 25 2025 Cameron Baird <[email protected]> - 102-10
319322
- Fix 0006-dracut.sh-validate-instmods patch to not break crypto module blacklisting
320323

0 commit comments

Comments
 (0)