a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 1826d8965057bd84517156a4b75c81bdfdae9ebc Mon Sep 17 00:00:00 2001
|
|
From: Antoine Tenart <antoine.tenart@bootlin.com>
|
|
Date: Wed, 1 Jul 2020 10:06:03 +0200
|
|
Subject: [PATCH] create_inode: set xattrs to the root directory as well
|
|
|
|
populate_fs do copy the xattrs for all files and directories, but the
|
|
root directory is skipped and as a result its extended attributes aren't
|
|
set. This is an issue when using mkfs to build a full system image that
|
|
can be used with SElinux in enforcing mode without making any runtime
|
|
fix at first boot.
|
|
|
|
This patch adds logic to set the root directory's extended attributes.
|
|
|
|
[Uspstream status: sent to the mailing list and has a Reviewed-by tag,
|
|
https://lore.kernel.org/linux-ext4/20200717100846.497546-1-antoine.tenart@bootlin.com/]
|
|
|
|
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
|
---
|
|
misc/create_inode.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/misc/create_inode.c b/misc/create_inode.c
|
|
index e8d1df6b55a5..fe66faf1b53d 100644
|
|
--- a/misc/create_inode.c
|
|
+++ b/misc/create_inode.c
|
|
@@ -1050,9 +1050,17 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
|
|
file_info.path_max_len = 255;
|
|
file_info.path = calloc(file_info.path_max_len, 1);
|
|
|
|
+ retval = set_inode_xattr(fs, root, source_dir);
|
|
+ if (retval) {
|
|
+ com_err(__func__, retval,
|
|
+ _("while copying xattrs on root directory"));
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
retval = __populate_fs(fs, parent_ino, source_dir, root, &hdlinks,
|
|
&file_info, fs_callbacks);
|
|
|
|
+out:
|
|
free(file_info.path);
|
|
free(hdlinks.hdl);
|
|
return retval;
|
|
--
|
|
2.26.2
|
|
|