summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-08 10:44:23 -0500
committerMark Hatle <mark.hatle@windriver.com>2017-09-14 08:29:01 -0500
commit4fefe83c3203c11fadbe43637a3058284b60427b (patch)
treeaf4b33f05100c12ed16851f5dd4129f0e176da25 /recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
parent694b8d1f1a590083e4445d6941f24b412ec0f206 (diff)
downloadmeta-selinux-4fefe83c3203c11fadbe43637a3058284b60427b.tar.gz
Refactor to conform to YP Compat requirements
Change the references to check for the distribution flag of 'selinux' being set before taking any action within the bbappends. This prevents the signature from being modified. Also remove PR changes, as they are no longer allowed. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch')
-rw-r--r--recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch b/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
new file mode 100644
index 0000000..1de0dde
--- /dev/null
+++ b/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
@@ -0,0 +1,37 @@
1From: Philip Tricca <flihp@twobit.us>
2To: tytso@mit.edu
3Cc: liezhi.yang@windriver.com
4Date: Sat, 20 Feb 2016 18:58:58 +0000
5Subject: [PATCH] misc/create_inode.c: Copy xattrs from root directory when populating fs.
6
7When copying a file system using the -d option the xattrs from the root
8directory need to be copied before the populate_fs recusion starts.
9
10Signed-off-by: Philip Tricca <flihp@twobit.us>
11---
12 misc/create_inode.c | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/misc/create_inode.c b/misc/create_inode.c
16index 0de5719..ee21186 100644
17--- a/misc/create_inode.c
18+++ b/misc/create_inode.c
19@@ -890,8 +890,15 @@ errcode_t populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
20 return retval;
21 }
22
23+ retval = set_inode_xattr(fs, root, source_dir);
24+ if (retval) {
25+ com_err(__func__, retval,
26+ _("while setting xattrs for \"%s\""), source_dir);
27+ goto out;
28+ }
29 retval = __populate_fs(fs, parent_ino, source_dir, root, &hdlinks);
30
31+out:
32 free(hdlinks.hdl);
33 return retval;
34 }
35--
362.1.4
37