chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't create $tempnode for devices without major
[elogind.git]
/
udevstart.c
diff --git
a/udevstart.c
b/udevstart.c
index 8f8342ff48f80a19d841b3c83f85e45e47cbd95a..a381c411a80f437157ed38a622723f52ba531041 100644
(file)
--- a/
udevstart.c
+++ b/
udevstart.c
@@
-1,13
+1,9
@@
/*
/*
- *
udevstart.c
+ *
quick and dirty way to populate a /dev directory
*
*
+ * Copyright (C) 2004 Harald Hoyer <harald@redhat.com>
* Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
- *
- * Quick and dirty way to populate a /dev with udev if your system
- * does not have access to a shell. Based originally on a patch
- * from:
- * Harald Hoyer <harald@redhat.com>
+ * Copyright (C) 2004-2006 Kay Sievers <kay@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-20,7
+16,7
@@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- *
675 Mass Ave, Cambridge, MA 02139
, USA.
+ *
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
*
*/
*
*/
@@
-40,6
+36,7
@@
#include "udev.h"
#include "udev_rules.h"
#include "udev.h"
#include "udev_rules.h"
+#include "udev_selinux.h"
static const char *udev_run_str;
static const char *udev_log_str;
static const char *udev_run_str;
static const char *udev_log_str;
@@
-108,7
+105,7
@@
static int add_device(const char *devpath)
{
struct sysfs_device *dev;
struct udevice *udev;
{
struct sysfs_device *dev;
struct udevice *udev;
- int retval;
+ int retval
= 0
;
/* clear and set environment for next event */
clearenv();
/* clear and set environment for next event */
clearenv();
@@
-123,14
+120,13
@@
static int add_device(const char *devpath)
if (dev == NULL)
return -1;
if (dev == NULL)
return -1;
- udev = udev_device_init();
+ udev = udev_device_init(
NULL
);
if (udev == NULL)
return -1;
/* override built-in sysfs device */
udev->dev = dev;
strcpy(udev->action, "add");
if (udev == NULL)
return -1;
/* override built-in sysfs device */
udev->dev = dev;
strcpy(udev->action, "add");
- udev->devt = udev_device_get_devt(udev);
if (strcmp(udev->dev->subsystem, "net") != 0) {
udev->devt = udev_device_get_devt(udev);
if (strcmp(udev->dev->subsystem, "net") != 0) {
udev->devt = udev_device_get_devt(udev);
@@
-148,13
+144,11
@@
static int add_device(const char *devpath)
goto exit;
}
if (udev->name[0] != '\0')
goto exit;
}
if (udev->name[0] != '\0')
- retval = udev_
add_device(
udev);
- else
{
+ retval = udev_
device_event(&rules,
udev);
+ else
info("device node creation supressed");
info("device node creation supressed");
- goto exit;
- }
- if (retval == 0 &&
!udev->ignore_device &&
udev_run) {
+ if (retval == 0 && udev_run) {
struct name_entry *name_loop;
dbg("executing run list");
struct name_entry *name_loop;
dbg("executing run list");
@@
-342,6
+336,7
@@
int main(int argc, char *argv[], char *envp[])
logging_init("udevstart");
udev_config_init();
logging_init("udevstart");
udev_config_init();
+ selinux_init();
dbg("version %s", UDEV_VERSION);
udev_run_str = getenv("UDEV_RUN");
dbg("version %s", UDEV_VERSION);
udev_run_str = getenv("UDEV_RUN");
@@
-372,6
+367,7
@@
int main(int argc, char *argv[], char *envp[])
udev_rules_cleanup(&rules);
sysfs_cleanup();
udev_rules_cleanup(&rules);
sysfs_cleanup();
+ selinux_exit();
logging_close();
return 0;
}
logging_close();
return 0;
}