Merge pull request #10996 from poettering/oci-prep

Preparation for the nspawn-OCI work
2018-11-30 10:09:00 +01:00
parent 00195abcbe 8f2eb7302d
commit b2ac2b01c8
31 changed files with 922 additions and 147 deletions
@@ -594,16 +594,17 @@ _public_ int sd_device_new_from_device_id(sd_device **ret, const char *id) {

        switch (id[0]) {
        case 'b':
-        case 'c':
-        {
-                char type;
-                int maj, min;
+        case 'c': {
+                dev_t devt;

-                r = sscanf(id, "%c%i:%i", &type, &maj, &min);
-                if (r != 3)
+                if (isempty(id))
                        return -EINVAL;

-                return sd_device_new_from_devnum(ret, type, makedev(maj, min));
+                r = parse_dev(id + 1, &devt);
+                if (r < 0)
+                        return r;
+
+                return sd_device_new_from_devnum(ret, id[0], devt);
        }
        case 'n':
        {