From: Andrey Borzenkov <arvidjaar@mail.ru>
Date: Sun, 21 Jan 2007 21:49:45 +0000 (+0100)
Subject: vol_id: add -L to print raw partition label
X-Git-Tag: 174~2080
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ede9b541712f0f7366f5481d55f5d56d0e47fcc8;p=systemd

vol_id: add -L to print raw partition label
---

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 0a1b756f..73843ef6 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -116,6 +116,7 @@ int main(int argc, char *argv[])
 			    "  -t             filesystem type\n"
 			    "  -l             filesystem label\n"
 			    "  -u             filesystem uuid\n"
+			    "  -L             raw label\n"
 			    " --skip-raid     don't probe for raid\n"
 			    " --probe-all     find possibly conflicting signatures\n"
 			    " --help\n"
@@ -125,6 +126,7 @@ int main(int argc, char *argv[])
 		PRINT_TYPE,
 		PRINT_LABEL,
 		PRINT_UUID,
+		PRINT_RAW_LABEL,
 	} print = PRINT_EXPORT;
 	struct volume_id *vid = NULL;
 	static char name[VOLUME_ID_LABEL_SIZE];
@@ -153,6 +155,8 @@ int main(int argc, char *argv[])
 			print = PRINT_LABEL;
 		} else if (strcmp(arg, "-u") == 0) {
 			print = PRINT_UUID;
+		} else if (strcmp(arg, "-L") == 0) {
+			print = PRINT_RAW_LABEL;
 		} else if (strcmp(arg, "--skip-raid") == 0) {
 			skip_raid = 1;
 		} else if (strcmp(arg, "--probe-all") == 0) {
@@ -306,6 +310,13 @@ int main(int argc, char *argv[])
 		}
 		printf("%s\n", vid->uuid);
 		break;
+	case PRINT_RAW_LABEL:
+		if (vid->label[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) {
+			rc = 3;
+			goto exit;
+		}
+		printf("%s\n", vid->label);
+		break;
 	}
 
 exit: