From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 18 Apr 2016 07:01:23 +0000 (+0200)
Subject: mkswap: tolerate ENOTSUP when failing to relabel
X-Git-Tag: v2.29-rc1~286
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d97dc0ee2505e80c8e9fca89aa2001b2ec2c3695;p=thirdparty%2Futil-linux.git

mkswap: tolerate ENOTSUP when failing to relabel

It might be that the underlying filesystem just doesn't support SELinux
labeling. This fixes creating swap on vfat live media:

  # livecd-iso-to-disk.sh --msdos --swap-size-mb 666 ...

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index a7c6a709b3..e44d039e15 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -522,7 +522,7 @@ int main(int argc, char **argv)
 		context_string = context_str(newcontext);
 
 		if (strcmp(context_string, oldcontext)!=0) {
-			if (fsetfilecon(ctl.fd, context_string))
+			if (fsetfilecon(ctl.fd, context_string) && errno != ENOTSUP)
 				err(EXIT_FAILURE, _("unable to relabel %s to %s"),
 						ctl.devname, context_string);
 		}