From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 8 Mar 2007 11:28:03 +0000 (+0100)
Subject: create_floppy_devices: apply specified mode without umask
X-Git-Tag: 174~2051
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5b7363c0642c2c513b7ebd58bd0cbbcbea355fdf;ds=sidebyside

create_floppy_devices: apply specified mode without umask
---

diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 7b61ef05b..7a3ddb2ff 100644
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 	int major = 2, minor;
 	uid_t uid = 0;
 	gid_t gid = 0;
-	mode_t mode = 0;
+	mode_t mode = 0660;
 	int create_nodes = 0;
 	int print_nodes = 0;
 	int unlink_nodes = 0;
@@ -165,10 +165,11 @@ int main(int argc, char **argv)
 			printf("%s b %d %d %d\n", node, mode, major, minor);
 		if (create_nodes) {
 			unlink(node);
-			selinux_setfscreatecon(node, NULL, mode);
+			selinux_setfscreatecon(node, NULL, S_IFBLK | mode);
 			mknod(node, S_IFBLK | mode, makedev(major,minor));
 			selinux_resetfscreatecon();
 			chown(node, uid, gid);
+			chmod(node, S_IFBLK | mode);
 		}
 		i++;
 	}