chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vol_id: clarify error message
[elogind.git]
/
extras
/
floppy
/
create_floppy_devices.c
diff --git
a/extras/floppy/create_floppy_devices.c
b/extras/floppy/create_floppy_devices.c
index 2c7d44b16d01a3d6f118fad26d7e0dd9353bb88a..f5069f722065b2aa56fb2bb9bcd5c8eb550a7282 100644
(file)
--- a/
extras/floppy/create_floppy_devices.c
+++ b/
extras/floppy/create_floppy_devices.c
@@
-25,7
+25,6
@@
#include <grp.h>
#include "../../udev/udev.h"
#include <grp.h>
#include "../../udev/udev.h"
-#include "../../udev/udev_selinux.h"
static char *table[] = {
"", "d360", "h1200", "u360", "u720", "h360", "h720",
static char *table[] = {
"", "d360", "h1200", "u360", "u720", "h360", "h720",
@@
-69,6
+68,7
@@
int main(int argc, char **argv)
logging_init("create_floppy_devices");
udev_set_log_fn(udev, log_fn);
logging_init("create_floppy_devices");
udev_set_log_fn(udev, log_fn);
+ udev_selinux_init(udev);
while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
switch (c) {
while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
switch (c) {
@@
-79,10
+79,10
@@
int main(int argc, char **argv)
print_nodes = 1;
break;
case 'U':
print_nodes = 1;
break;
case 'U':
- uid = lookup_user(udev, optarg);
+ uid =
util_
lookup_user(udev, optarg);
break;
case 'G':
break;
case 'G':
- gid = lookup_group(udev, optarg);
+ gid =
util_
lookup_group(udev, optarg);
break;
case 'M':
mode = strtol(optarg, NULL, 0);
break;
case 'M':
mode = strtol(optarg, NULL, 0);
@@
-145,8
+145,6
@@
int main(int argc, char **argv)
if (type == 0)
return 0;
if (type == 0)
return 0;
- selinux_init(udev);
-
i = 0;
while (table_sup[type][i]) {
sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
i = 0;
while (table_sup[type][i]) {
sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
@@
-155,16
+153,16
@@
int main(int argc, char **argv)
printf("%s b %d %d %d\n", node, mode, major, minor);
if (create_nodes) {
unlink(node);
printf("%s b %d %d %d\n", node, mode, major, minor);
if (create_nodes) {
unlink(node);
-
selinux_setfscreatecon(udev, node, NULL
, S_IFBLK | mode);
+
udev_selinux_setfscreatecon(udev, node
, S_IFBLK | mode);
mknod(node, S_IFBLK | mode, makedev(major,minor));
mknod(node, S_IFBLK | mode, makedev(major,minor));
- selinux_resetfscreatecon(udev);
+
udev_
selinux_resetfscreatecon(udev);
chown(node, uid, gid);
chmod(node, S_IFBLK | mode);
}
i++;
}
chown(node, uid, gid);
chmod(node, S_IFBLK | mode);
}
i++;
}
- selinux_exit(udev);
+
udev_
selinux_exit(udev);
udev_unref(udev);
exit:
return 0;
udev_unref(udev);
exit:
return 0;