libfdisk: (script) support shortcuts in the type= field

[thirdparty/util-linux.git] / libfdisk / src / script.c

diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c
index 3db76c87b3d716b959a46b285ebdce23d34af387..a28983dbad866d438156249509ebec92e28e34a6 100644 (file)
--- a/libfdisk/src/script.c
+++ b/libfdisk/src/script.c
@@ -61,6 +61,8 @@ struct fdisk_script {
                                force_label : 1;        /* label: <name> specified */
 };
 
+static struct fdisk_parttype *translate_type_shortcuts(struct fdisk_script *dp, char *str);
+
 
 static void fdisk_script_free_header(struct fdisk_scriptheader *fi)
 {
@@ -1054,8 +1056,11 @@ static int parse_line_nameval(struct fdisk_script *dp, char *s)
                        rc = next_string(&p, &type);
                        if (rc)
                                break;
-                       pa->type = fdisk_label_parse_parttype(
-                                       script_get_label(dp), type);
+
+                       pa->type = translate_type_shortcuts(dp, type);
+                       if (!pa->type)
+                               pa->type = fdisk_label_parse_parttype(
+                                               script_get_label(dp), type);
                        free(type);
 
                        if (!pa->type) {