2003-07-21 10:48:48 +07:00
|
|
|
/*
|
|
|
|
* udev-remove.c
|
|
|
|
*
|
|
|
|
* Userspace devfs
|
|
|
|
*
|
|
|
|
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* Free Software Foundation version 2 of the License.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
#include "udev.h"
|
|
|
|
#include "udev_version.h"
|
2003-12-09 00:40:40 +07:00
|
|
|
#include "udev_dbus.h"
|
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 12:53:20 +07:00
|
|
|
#include "logging.h"
|
2003-07-21 10:48:48 +07:00
|
|
|
#include "namedev.h"
|
2003-08-06 13:57:23 +07:00
|
|
|
#include "udevdb.h"
|
2003-07-21 10:48:48 +07:00
|
|
|
|
2003-12-08 00:12:07 +07:00
|
|
|
static int delete_path(char *path)
|
2003-07-21 10:48:48 +07:00
|
|
|
{
|
2003-12-08 00:12:07 +07:00
|
|
|
char *pos;
|
|
|
|
int retval;
|
2003-07-21 10:48:48 +07:00
|
|
|
|
2003-12-08 00:12:07 +07:00
|
|
|
pos = strrchr(path, '/');
|
|
|
|
while (1) {
|
|
|
|
*pos = '\0';
|
|
|
|
pos = strrchr(path, '/');
|
|
|
|
|
|
|
|
/* don't remove the last one */
|
|
|
|
if ((pos == path) || (pos == NULL))
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* remove if empty */
|
|
|
|
retval = rmdir(path);
|
2004-03-02 13:34:12 +07:00
|
|
|
if (errno == ENOENT)
|
|
|
|
retval = 0;
|
2003-12-08 00:12:07 +07:00
|
|
|
if (retval) {
|
|
|
|
if (errno == ENOTEMPTY)
|
|
|
|
return 0;
|
|
|
|
dbg("rmdir(%s) failed with error '%s'",
|
|
|
|
path, strerror(errno));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
dbg("removed '%s'", path);
|
2003-10-21 12:48:44 +07:00
|
|
|
}
|
2003-12-08 00:12:07 +07:00
|
|
|
return 0;
|
2003-07-21 10:48:48 +07:00
|
|
|
}
|
|
|
|
|
2003-12-08 00:12:07 +07:00
|
|
|
static int delete_node(struct udevice *dev)
|
2003-07-21 10:48:48 +07:00
|
|
|
{
|
2004-03-04 09:16:35 +07:00
|
|
|
char filename[NAME_SIZE];
|
|
|
|
char linkname[NAME_SIZE];
|
|
|
|
char partitionname[NAME_SIZE];
|
2003-11-12 18:48:01 +07:00
|
|
|
int retval;
|
2004-02-17 12:44:28 +07:00
|
|
|
int i;
|
[PATCH] better fix for NAME="foo-%c{N}" gets a truncated name
On Wed, Mar 03, 2004 at 04:56:34PM -0800, Greg KH wrote:
> On Wed, Mar 03, 2004 at 03:57:04PM -0800, Patrick Mansfield wrote:
> >
> > Here is a patch for some new tests.
>
> Applied, thanks.
Here is a small improvement, which looks much better.
Hey Pat, thanks a lot for finding the recent bug, hope this one will
not break it again :)
2004-03-05 09:55:34 +07:00
|
|
|
char *pos;
|
|
|
|
int len;
|
2003-07-21 10:48:48 +07:00
|
|
|
|
2004-02-27 10:37:47 +07:00
|
|
|
strfieldcpy(filename, udev_root);
|
|
|
|
strfieldcat(filename, dev->name);
|
2003-07-21 10:48:48 +07:00
|
|
|
|
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 12:53:20 +07:00
|
|
|
info("removing device node '%s'", filename);
|
2003-11-12 18:48:01 +07:00
|
|
|
retval = unlink(filename);
|
2004-03-02 13:34:12 +07:00
|
|
|
if (errno == ENOENT)
|
|
|
|
retval = 0;
|
2003-11-12 18:48:01 +07:00
|
|
|
if (retval) {
|
|
|
|
dbg("unlink(%s) failed with error '%s'",
|
|
|
|
filename, strerror(errno));
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2004-02-17 12:44:28 +07:00
|
|
|
/* remove partition nodes */
|
|
|
|
if (dev->partitions > 0) {
|
|
|
|
info("removing partitions '%s[1-%i]'", filename, dev->partitions);
|
|
|
|
for (i = 1; i <= dev->partitions; i++) {
|
2004-02-28 16:59:02 +07:00
|
|
|
strfieldcpy(partitionname, filename);
|
|
|
|
strintcat(partitionname, i);
|
2004-02-17 12:44:28 +07:00
|
|
|
unlink(partitionname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-12 18:48:01 +07:00
|
|
|
/* remove subdirectories */
|
2003-12-08 00:12:07 +07:00
|
|
|
if (strchr(dev->name, '/'))
|
|
|
|
delete_path(filename);
|
|
|
|
|
2004-03-04 09:16:35 +07:00
|
|
|
foreach_strpart(dev->symlink, " ", pos, len) {
|
[PATCH] better fix for NAME="foo-%c{N}" gets a truncated name
On Wed, Mar 03, 2004 at 04:56:34PM -0800, Greg KH wrote:
> On Wed, Mar 03, 2004 at 03:57:04PM -0800, Patrick Mansfield wrote:
> >
> > Here is a patch for some new tests.
>
> Applied, thanks.
Here is a small improvement, which looks much better.
Hey Pat, thanks a lot for finding the recent bug, hope this one will
not break it again :)
2004-03-05 09:55:34 +07:00
|
|
|
strnfieldcpy(linkname, pos, len+1);
|
2004-03-04 09:16:35 +07:00
|
|
|
strfieldcpy(filename, udev_root);
|
|
|
|
strfieldcat(filename, linkname);
|
|
|
|
|
|
|
|
dbg("unlinking symlink '%s'", filename);
|
|
|
|
retval = unlink(filename);
|
|
|
|
if (errno == ENOENT)
|
|
|
|
retval = 0;
|
|
|
|
if (retval) {
|
|
|
|
dbg("unlink(%s) failed with error '%s'",
|
|
|
|
filename, strerror(errno));
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
if (strchr(dev->symlink, '/')) {
|
|
|
|
delete_path(filename);
|
2003-11-12 18:48:01 +07:00
|
|
|
}
|
|
|
|
}
|
2003-12-08 00:12:07 +07:00
|
|
|
|
2003-11-12 18:48:01 +07:00
|
|
|
return retval;
|
2003-07-21 10:48:48 +07:00
|
|
|
}
|
|
|
|
|
2003-12-08 00:12:07 +07:00
|
|
|
/*
|
|
|
|
* Look up the sysfs path in the database to see if we have named this device
|
|
|
|
* something different from the kernel name. If we have, us it. If not, use
|
|
|
|
* the default kernel name for lack of anything else to know to do.
|
|
|
|
*/
|
|
|
|
int udev_remove_device(char *path, char *subsystem)
|
2003-07-21 10:48:48 +07:00
|
|
|
{
|
2003-12-23 13:47:58 +07:00
|
|
|
struct udevice dev;
|
2003-12-08 00:12:07 +07:00
|
|
|
char *temp;
|
2003-12-20 09:29:01 +07:00
|
|
|
int retval;
|
|
|
|
|
2003-12-23 13:47:58 +07:00
|
|
|
memset(&dev, 0, sizeof(dev));
|
2003-07-21 10:48:48 +07:00
|
|
|
|
2003-12-23 13:47:58 +07:00
|
|
|
retval = udevdb_get_dev(path, &dev);
|
2003-12-20 09:29:01 +07:00
|
|
|
if (retval) {
|
2003-12-08 00:12:07 +07:00
|
|
|
dbg("'%s' not found in database, falling back on default name", path);
|
|
|
|
temp = strrchr(path, '/');
|
|
|
|
if (temp == NULL)
|
|
|
|
return -ENODEV;
|
2004-02-27 10:37:47 +07:00
|
|
|
strfieldcpy(dev.name, &temp[1]);
|
2003-07-21 10:48:48 +07:00
|
|
|
}
|
|
|
|
|
2003-12-23 13:47:58 +07:00
|
|
|
dbg("name is '%s'", dev.name);
|
2003-12-08 00:12:07 +07:00
|
|
|
udevdb_delete_dev(path);
|
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-09 00:19:19 +07:00
|
|
|
|
2003-12-23 13:47:58 +07:00
|
|
|
sysbus_send_remove(dev.name, path);
|
2003-12-09 00:40:40 +07:00
|
|
|
|
2003-12-23 13:47:58 +07:00
|
|
|
retval = delete_node(&dev);
|
2003-12-20 09:29:01 +07:00
|
|
|
return retval;
|
2003-07-21 10:48:48 +07:00
|
|
|
}
|