chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove completely useless start script
[elogind.git]
/
udev_remove.c
diff --git
a/udev_remove.c
b/udev_remove.c
index c3a7880b496cb2a9d25554a5e5a59b92daef83c5..cb5523af92aa04a460863473cff7f80c6791eb75 100644
(file)
--- a/
udev_remove.c
+++ b/
udev_remove.c
@@
-1,10
+1,8
@@
/*
* udev-remove.c
*
/*
* udev-remove.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ *
Copyright (C) 2004 Kay Sievers <kay.sievers@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
@@
-34,7
+32,6
@@
#include "udev.h"
#include "udev_utils.h"
#include "udev_version.h"
#include "udev.h"
#include "udev_utils.h"
#include "udev_version.h"
-#include "namedev.h"
#include "udev_db.h"
#include "logging.h"
#include "udev_db.h"
#include "logging.h"
@@
-59,8
+56,7
@@
static int delete_path(const char *path)
if (retval) {
if (errno == ENOTEMPTY)
return 0;
if (retval) {
if (errno == ENOTEMPTY)
return 0;
- dbg("rmdir(%s) failed with error '%s'",
- path, strerror(errno));
+ err("rmdir(%s) failed: %s", path, strerror(errno));
break;
}
dbg("removed '%s'", path);
break;
}
dbg("removed '%s'", path);
@@
-91,7
+87,7
@@
static int delete_node(struct udevice *udev)
continue;;
}
continue;;
}
-
dbg
("removing symlink '%s'", filename);
+
info
("removing symlink '%s'", filename);
unlink(filename);
if (strchr(filename, '/'))
unlink(filename);
if (strchr(filename, '/'))
@@
-115,6
+111,10
@@
static int delete_node(struct udevice *udev)
if (retval)
return retval;
if (retval)
return retval;
+ /* export DEVNAME to the environment */
+ snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+ udev->devname[sizeof(udev->devname)-1] = '\0';
+
num = udev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
num = udev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
@@
-141,9
+141,7
@@
static int delete_node(struct udevice *udev)
*/
int udev_remove_device(struct udevice *udev)
{
*/
int udev_remove_device(struct udevice *udev)
{
- const char *temp;
-
- if (udev->type != BLOCK && udev->type != CLASS)
+ if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
return 0;
if (udev_db_get_device(udev, udev->devpath) == 0) {
return 0;
if (udev_db_get_device(udev, udev->devpath) == 0) {
@@
-154,17
+152,9
@@
int udev_remove_device(struct udevice *udev)
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
} else {
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
} else {
- /* fall back to kernel name */
- temp = strrchr(udev->devpath, '/');
- if (temp == NULL)
- return -ENODEV;
- strlcpy(udev->name, &temp[1], sizeof(udev->name));
- dbg("'%s' not found in database, falling back on default name", udev->name);
+ dbg("'%s' not found in database, don't remove anything", udev->devpath);
+ return -1;
}
}
- /* use full path to the environment */
- snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
- udev->devname[sizeof(udev->devname)-1] = '\0';
-
return delete_node(udev);
}
return delete_node(udev);
}