udevd - bring into sbin, add rc script

* Bring udevd into sbin so it can be used very early on, for example in
  the initrd environment.

* Add an rc script for udevd.

* Remove debugging flags from libdevattr Makefile

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index b85004b..1a58987 100644 (file)
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -22,7 +22,7 @@ FILES=        DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz \
        quota random rarpd rcconf resident rndcontrol root route6d routed \
        routing rpcbind rtadvd rtsold rwho sysdb savecore sdpd securelevel \
        sendmail sensorsd serial sppp sshd statd swap1 syscons sysctl syslogd \
-       timed ttys usbd varsym vinum vkernel virecover \
+       timed ttys udevd usbd varsym vinum vkernel virecover \
        watchdogd wpa_supplicant \
        ypbind yppasswdd ypserv ypset ypupdated ypxfrd
 

diff --git a/etc/rc.d/udevd b/etc/rc.d/udevd
new file mode 100644 (file)
index 0000000..7fbef5d
--- /dev/null
+++ b/etc/rc.d/udevd
@@ -0,0 +1,12 @@
+#!/bin/sh
+# PROVIDE: udevd
+# REQUIRE: syslogd
+
+. /etc/rc.subr
+
+name="udevd"
+rcvar=`set_rcvar`
+command="/sbin/${name}"
+
+load_rc_config $name
+run_rc_command "$1"

diff --git a/lib/libdevattr/Makefile b/lib/libdevattr/Makefile
index 340eaa8..7e7f120 100644 (file)
--- a/lib/libdevattr/Makefile
+++ b/lib/libdevattr/Makefile
@@ -2,7 +2,6 @@ LIB=    devattr
 SRCS=  devattr.c devattr_device.c devattr_enumerate.c devattr_monitor.c
 
 WARNS?=        6
-DEBUG_FLAGS=-g
 
 LDADD+=        -lprop
 DPADD+=        ${LIBPROP}

diff --git a/sbin/Makefile b/sbin/Makefile
index 36bb84b..4655bc6 100644 (file)
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -91,6 +91,7 @@ SUBDIR=       adjkerntz \
        swapon \
        sysctl \
        tunefs \
+       udevd \
        umount \
        vinum
 

diff --git a/usr.sbin/udevd/Makefile b/sbin/udevd/Makefile
similarity index 90%
rename from usr.sbin/udevd/Makefile
rename to sbin/udevd/Makefile
index 9e1c3f5..371a89b 100644 (file)
--- a/usr.sbin/udevd/Makefile
+++ b/sbin/udevd/Makefile
@@ -1,4 +1,3 @@
-DEBUG_FLAGS=-g
 PROG=  udevd
 SRCS=  udevd.c udevd_client.c udevd_monitor.c udevd_pdev.c 
 SRCS+= udevd_socket.c

diff --git a/usr.sbin/udevd/mktest b/sbin/udevd/mktest
similarity index 100%
rename from usr.sbin/udevd/mktest
rename to sbin/udevd/mktest

diff --git a/usr.sbin/udevd/test_udevd.c b/sbin/udevd/test_udevd.c
similarity index 100%
rename from usr.sbin/udevd/test_udevd.c
rename to sbin/udevd/test_udevd.c

diff --git a/usr.sbin/udevd/udevd.c b/sbin/udevd/udevd.c
similarity index 99%
rename from usr.sbin/udevd/udevd.c
rename to sbin/udevd/udevd.c
index bed883c..015998e 100644 (file)
--- a/usr.sbin/udevd/udevd.c
+++ b/sbin/udevd/udevd.c
@@ -321,17 +321,17 @@ int main(int argc __unused, char *argv[] __unused)
                err(1, "%s", UDEV_DEVICE_PATH);
        unblock_descriptor(udevfd);
 
-       //if (daemon(0, 0) == -1)
-       //      err(1, "daemon");
+       s = init_local_server(LISTEN_SOCKET_FILE, SOCK_STREAM, 0);
+       if (s < 0)
+               err(1, "init_local_server");
+
+       if (daemon(0, 0) == -1)
+               err(1, "daemon");
 
        syslog(LOG_ERR, "udevd started");
 
        pdev_array_entry_insert(udev_getdevs(udevfd));
 
-       s = init_local_server(LISTEN_SOCKET_FILE, SOCK_STREAM, 0);
-       if (s < 0)
-               err(1, "init_local_server");
-
        memset(fds, 0 , sizeof(fds));
        fds[UDEV_DEVICE_FD_IDX].fd = udevfd;
        fds[UDEV_DEVICE_FD_IDX].events = POLLIN;

diff --git a/usr.sbin/udevd/udevd.h b/sbin/udevd/udevd.h
similarity index 100%
rename from usr.sbin/udevd/udevd.h
rename to sbin/udevd/udevd.h

diff --git a/usr.sbin/udevd/udevd_client.c b/sbin/udevd/udevd_client.c
similarity index 100%
rename from usr.sbin/udevd/udevd_client.c
rename to sbin/udevd/udevd_client.c

diff --git a/usr.sbin/udevd/udevd_monitor.c b/sbin/udevd/udevd_monitor.c
similarity index 100%
rename from usr.sbin/udevd/udevd_monitor.c
rename to sbin/udevd/udevd_monitor.c

diff --git a/usr.sbin/udevd/udevd_pdev.c b/sbin/udevd/udevd_pdev.c
similarity index 100%
rename from usr.sbin/udevd/udevd_pdev.c
rename to sbin/udevd/udevd_pdev.c

diff --git a/usr.sbin/udevd/udevd_socket.c b/sbin/udevd/udevd_socket.c
similarity index 100%
rename from usr.sbin/udevd/udevd_socket.c
rename to sbin/udevd/udevd_socket.c

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 93b02fd..a262c45 100644 (file)
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -123,7 +123,6 @@ SUBDIR= 802_11 \
        traceroute6 \
        trpt \
        tzsetup \
-       udevd \
        usbd \
        usbdevs \
        vidcontrol \