/*
* udev-remove.c
*
- * Userspace devfs
- *
* 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
#include "udev.h"
#include "udev_utils.h"
#include "udev_version.h"
-#include "namedev.h"
#include "udev_db.h"
#include "logging.h"
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);
continue;;
}
- dbg("removing symlink '%s'", filename);
+ info("removing symlink '%s'", filename);
unlink(filename);
if (strchr(filename, '/'))
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);
*/
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) {
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);
}