2003-07-21 07:48:48 +04: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 0213 9 , 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-08 20:40:40 +03: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 08:53:20 +03:00
# include "logging.h"
2003-07-21 07:48:48 +04:00
# include "namedev.h"
2003-08-06 10:57:23 +04:00
# include "udevdb.h"
2003-07-21 07:48:48 +04:00
2003-12-07 20:12:07 +03:00
static int delete_path ( char * path )
2003-07-21 07:48:48 +04:00
{
2003-12-07 20:12:07 +03:00
char * pos ;
int retval ;
2003-07-21 07:48:48 +04:00
2003-12-07 20:12:07 +03: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 ) ;
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 09:48:44 +04:00
}
2003-12-07 20:12:07 +03:00
return 0 ;
2003-07-21 07:48:48 +04:00
}
2003-12-07 20:12:07 +03:00
static int delete_node ( struct udevice * dev )
2003-07-21 07:48:48 +04:00
{
char filename [ 255 ] ;
2003-12-10 11:47:00 +03:00
char * symlinks ;
char * linkname ;
2003-11-12 14:48:01 +03:00
int retval ;
2003-07-21 07:48:48 +04:00
2003-10-22 07:19:09 +04:00
strncpy ( filename , udev_root , sizeof ( filename ) ) ;
2003-12-07 20:12:07 +03:00
strncat ( filename , dev - > name , sizeof ( filename ) ) ;
2003-07-21 07:48:48 +04: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 08:53:20 +03:00
info ( " removing device node '%s' " , filename ) ;
2003-11-12 14:48:01 +03:00
retval = unlink ( filename ) ;
if ( retval ) {
dbg ( " unlink(%s) failed with error '%s' " ,
filename , strerror ( errno ) ) ;
return retval ;
}
/* remove subdirectories */
2003-12-07 20:12:07 +03:00
if ( strchr ( dev - > name , ' / ' ) )
delete_path ( filename ) ;
if ( * dev - > symlink ) {
2003-12-10 11:47:00 +03:00
symlinks = dev - > symlink ;
while ( 1 ) {
linkname = strsep ( & symlinks , " " ) ;
if ( linkname = = NULL )
break ;
strncpy ( filename , udev_root , sizeof ( filename ) ) ;
strncat ( filename , linkname , sizeof ( filename ) ) ;
dbg ( " unlinking symlink '%s' " , filename ) ;
retval = unlink ( filename ) ;
if ( retval ) {
dbg ( " unlink(%s) failed with error '%s' " ,
filename , strerror ( errno ) ) ;
return retval ;
}
if ( strchr ( dev - > symlink , ' / ' ) ) {
delete_path ( filename ) ;
}
2003-11-12 14:48:01 +03:00
}
}
2003-12-07 20:12:07 +03:00
2003-11-12 14:48:01 +03:00
return retval ;
2003-07-21 07:48:48 +04:00
}
2003-12-07 20:12:07 +03: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 07:48:48 +04:00
{
2003-12-23 09:47:58 +03:00
struct udevice dev ;
2003-12-07 20:12:07 +03:00
char * temp ;
2003-12-20 05:29:01 +03:00
int retval ;
2003-12-23 09:47:58 +03:00
memset ( & dev , 0 , sizeof ( dev ) ) ;
2003-07-21 07:48:48 +04:00
2003-12-23 09:47:58 +03:00
retval = udevdb_get_dev ( path , & dev ) ;
2003-12-20 05:29:01 +03:00
if ( retval ) {
2003-12-07 20:12:07 +03:00
dbg ( " '%s' not found in database, falling back on default name " , path ) ;
temp = strrchr ( path , ' / ' ) ;
if ( temp = = NULL )
return - ENODEV ;
2003-12-23 09:47:58 +03:00
strncpy ( dev . name , & temp [ 1 ] , sizeof ( dev . name ) ) ;
2003-07-21 07:48:48 +04:00
}
2003-12-23 09:47:58 +03:00
dbg ( " name is '%s' " , dev . name ) ;
2003-12-07 20:12:07 +03: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-08 20:19:19 +03:00
2003-12-23 09:47:58 +03:00
sysbus_send_remove ( dev . name , path ) ;
2003-12-08 20:40:40 +03:00
2003-12-23 09:47:58 +03:00
retval = delete_node ( & dev ) ;
2003-12-20 05:29:01 +03:00
return retval ;
2003-07-21 07:48:48 +04:00
}