Version 1.17.2: apply post 1.17.1 fixes, replace patch applet by Rob's version

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index b4042c07e..cd6c1a89d 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -132,6 +132,7 @@ static void make_device(char *path, int delete)
                         major = -1;
                 }
         }
+        /* else: for delete, -1 still deletes the node, but < -1 suppresses that */
 
         /* Determine device name, type, major and minor */
         device_name = (char*) bb_basename(path);
@@ -279,7 +280,7 @@ static void make_device(char *path, int delete)
                                 if (aliaslink == '!' && s == a+1) {
                                         val = st;
                                         /* "!": suppress node creation/deletion */
-                                        major = -1;
+                                        major = -2;
                                 }
                                 else if (aliaslink == '>' || aliaslink == '=') {
                                         val = st;
@@ -379,7 +380,7 @@ static void make_device(char *path, int delete)
                                 free(command);
                         }
 
-                        if (delete && major >= 0) {
+                        if (delete && major >= -1) {
                                 if (ENABLE_FEATURE_MDEV_RENAME && alias) {
                                         if (aliaslink == '>')
                                                 unlink(device_name);