allow clean shutdown of udevd

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 4580a779c6be8b77b3c5ccf8805765be20890a1c..cededf002d8518c2b62074c3936b7504cecc9570 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -650,10 +650,12 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 
 void udev_rules_close(struct udev_rules *rules)
 {
 
 void udev_rules_close(struct udev_rules *rules)
 {

-       if (rules->mapped)
-               file_unmap(rules->buf, rules->bufsize);
-       else
-               free(rules->buf);
-
-       rules->buf = NULL;
+       if (rules->buf) {
+               if (rules->mapped) {
+                       rules->mapped = 0;
+                       file_unmap(rules->buf, rules->bufsize);
+               } else
+                       free(rules->buf);
+               rules->buf = NULL;
+       }

 }
 }

diff --git a/udevd.c b/udevd.c
index fa14c56073cfd042c7912861cc08d7bdd9c3670e..9242acce315ddd7c9ec9a21709f5751ccbf298d6 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -58,6 +58,7 @@ static int pipefds[2];
 static volatile int sigchilds_waiting;
 static volatile int run_msg_q;
 static volatile int sig_flag;
 static volatile int sigchilds_waiting;
 static volatile int run_msg_q;
 static volatile int sig_flag;

+static volatile int udev_exit;

 static int init_phase = 1;
 static int run_exec_q;
 static int stop_exec_q;
 static int init_phase = 1;
 static int run_exec_q;
 static int stop_exec_q;


@@ -641,23 +642,20 @@ static void asmlinkage sig_handler(int signum)
        switch (signum) {
                case SIGINT:
                case SIGTERM:
        switch (signum) {
                case SIGINT:
                case SIGTERM:

-                       exit(20 + signum);
+                       udev_exit = 1;

                        break;
                case SIGALRM:
                        /* set flag, then write to pipe if needed */
                        run_msg_q = 1;
                        break;
                case SIGALRM:
                        /* set flag, then write to pipe if needed */
                        run_msg_q = 1;

-                       goto do_write;

                        break;
                case SIGCHLD:
                        /* set flag, then write to pipe if needed */
                        sigchilds_waiting = 1;
                        break;
                case SIGCHLD:
                        /* set flag, then write to pipe if needed */
                        sigchilds_waiting = 1;

-                       goto do_write;

                        break;
        }
 
                        break;
        }
 

-do_write:
-       /* if pipe is empty, write to pipe to force select to return
-        * immediately when it gets called
+       /* if pipe is empty, write to pipe to force select to return,
+        * which will wakeup our mainloop

         */
        if (!sig_flag) {
                rc = write(pipefds[1],&signum,sizeof(signum));
         */
        if (!sig_flag) {
                rc = write(pipefds[1],&signum,sizeof(signum));


@@ -839,7 +837,7 @@ int main(int argc, char *argv[], char *envp[])
        chdir("/");
        umask(umask(077) | 022);
 
        chdir("/");
        umask(umask(077) | 022);
 

-       /*set a reasonable scheduling priority for the daemon */
+       /* set a reasonable scheduling priority for the daemon */

        setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
 
        /* Set fds to dev/null */
        setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
 
        /* Set fds to dev/null */


@@ -887,6 +885,7 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGTERM, &act, NULL);
        sigaction(SIGALRM, &act, NULL);
        sigaction(SIGCHLD, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
        sigaction(SIGALRM, &act, NULL);
        sigaction(SIGCHLD, &act, NULL);

+       sigaction(SIGHUP, &act, NULL);

 
        if (init_uevent_netlink_sock() < 0) {
                dbg("uevent socket not available");
 
        if (init_uevent_netlink_sock() < 0) {
                dbg("uevent socket not available");


@@ -941,11 +940,11 @@ int main(int argc, char *argv[], char *envp[])
 
        FD_ZERO(&readfds);
        FD_SET(udevd_sock, &readfds);
 
        FD_ZERO(&readfds);
        FD_SET(udevd_sock, &readfds);

-       if (uevent_netlink_sock != -1)
+       if (uevent_netlink_sock > 0)

                FD_SET(uevent_netlink_sock, &readfds);
        FD_SET(pipefds[0], &readfds);
        maxsockplus = udevd_sock+1;
                FD_SET(uevent_netlink_sock, &readfds);
        FD_SET(pipefds[0], &readfds);
        maxsockplus = udevd_sock+1;

-       while (1) {
+       while (!udev_exit) {

                struct uevent_msg *msg;
 
                fd_set workreadfds = readfds;
                struct uevent_msg *msg;
 
                fd_set workreadfds = readfds;


@@ -957,6 +956,7 @@ int main(int argc, char *argv[], char *envp[])
                        continue;
                }
 
                        continue;
                }
 

+               /* get user socket message */

                if (FD_ISSET(udevd_sock, &workreadfds)) {
                        msg = get_udevd_msg();
                        if (msg) {
                if (FD_ISSET(udevd_sock, &workreadfds)) {
                        msg = get_udevd_msg();
                        if (msg) {


@@ -970,6 +970,7 @@ int main(int argc, char *argv[], char *envp[])
                        }
                }
 
                        }
                }
 

+               /* get kernel netlink message */

                if (FD_ISSET(uevent_netlink_sock, &workreadfds)) {
                        msg = get_netlink_msg();
                        if (msg) {
                if (FD_ISSET(uevent_netlink_sock, &workreadfds)) {
                        msg = get_netlink_msg();
                        if (msg) {


@@ -982,9 +983,11 @@ int main(int argc, char *argv[], char *envp[])
                        }
                }
 
                        }
                }
 

+               /* received a signal, clear our notification pipe */

                if (FD_ISSET(pipefds[0], &workreadfds))
                        user_sighandler();
 
                if (FD_ISSET(pipefds[0], &workreadfds))
                        user_sighandler();
 

+               /* forked child have returned */

                if (sigchilds_waiting) {
                        sigchilds_waiting = 0;
                        reap_sigchilds();
                if (sigchilds_waiting) {
                        sigchilds_waiting = 0;
                        reap_sigchilds();


@@ -1009,6 +1012,13 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 exit:
        }
 
 exit:

+       if (udevd_sock > 0)
+               close(udevd_sock);
+
+       if (uevent_netlink_sock > 0)
+               close(uevent_netlink_sock);
+

        logging_close();
        logging_close();

-       return 1;
+
+       return 0;

 }
 }