mke2fs: Add -U option to specify the UUID for the new filesystem

Patch integrated from Mandriva

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index ddababb..1605895 100644 (file)
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -100,6 +100,10 @@ mke2fs \- create an ext2/ext3 filesystem
 .I usage-type
 ]
 [
+.B \-U
+.I UUID
+]
+[
 .B \-V
 ]
 .I device
@@ -597,6 +601,9 @@ Otherwise,
 will use the default filesystem type
 .IR default .
 .TP
+.BI \-U " UUID"
+Create the filesystem with the specified UUID.
+.TP
 .B \-v
 Verbose execution.
 .TP

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 0967bdc..0f9238e 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -86,6 +86,7 @@ char  *bad_blocks_filename;
 __u32  fs_stride;
 
 struct ext2_super_block fs_param;
+char *fs_uuid = NULL;
 char *creator_os;
 char *volume_label;
 char *mount_dir;
@@ -108,7 +109,7 @@ static void usage(void)
        "\t[-g blocks-per-group] [-L volume-label] "
        "[-M last-mounted-directory]\n\t[-O feature[,...]] "
        "[-r fs-revision] [-E extended-option[,...]]\n"
-       "\t[-T fs-type] [-jnqvFSV] device [blocks-count]\n"),
+       "\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"),
                program_name);
        exit(1);
 }
@@ -1165,7 +1166,7 @@ static void PRS(int argc, char *argv[])
        }
 
        while ((c = getopt (argc, argv,
-                   "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:L:M:N:O:R:ST:V")) != EOF) {
+                   "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:L:M:N:O:R:ST:U:V")) != EOF) {
                switch (c) {
                case 'b':
                        blocksize = strtol(optarg, &tmp, 0);
@@ -1331,6 +1332,9 @@ static void PRS(int argc, char *argv[])
                case 'T':
                        usage_types = optarg;
                        break;
+               case 'U':
+                       fs_uuid = optarg;
+                       break;
                case 'V':
                        /* Print version number and exit */
                        show_version_only++;
@@ -1879,9 +1883,16 @@ int main (int argc, char *argv[])
                zap_sector(fs, 2, 6);
 
        /*
-        * Generate a UUID for it...
+        * Parse or generate a UUID for the filesystem
         */
-       uuid_generate(fs->super->s_uuid);
+       if (fs_uuid) {
+               if (uuid_parse(fs_uuid, fs->super->s_uuid) !=0) {
+                       com_err(device_name, 0, "could not parse UUID: %s\n",
+                               fs_uuid);
+                       exit(1);
+               }
+       } else
+               uuid_generate(fs->super->s_uuid);
 
        /*
         * Initialize the directory index variables