[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] mkrescue: add argument --fixed-time to get reproducible uuid
From: |
Alexander Couzens |
Subject: |
[PATCH 2/3] mkrescue: add argument --fixed-time to get reproducible uuids |
Date: |
Fri, 4 Dec 2015 17:10:43 +0100 |
The uuid generation is based on the time.
---
util/grub-mkrescue.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
index 4511826..164c4e1 100644
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -52,6 +52,7 @@ static int xorriso_arg_alloc;
static char **xorriso_argv;
static char *iso_uuid;
static char *iso9660_dir;
+static time_t fixed_time;
static void
xorriso_push (const char *val)
@@ -110,6 +111,7 @@ static struct argp_option options[] = {
{"product-version", OPTION_PRODUCT_VERSION, N_("STRING"), 0, N_("use STRING
as product version"), 2},
{"sparc-boot", OPTION_SPARC_BOOT, 0, 0, N_("enable sparc boot. Disables
HFS+, APM, ARCS and boot as disk image for i386-pc"), 2},
{"arcs-boot", OPTION_ARCS_BOOT, 0, 0, N_("enable ARCS (big-endian mips
machines, mostly SGI) boot. Disables HFS+, APM, sparc64 and boot as disk image
for i386-pc"), 2},
+ {"fixed-time", 't', N_("TIMEEPOCH"), 0, N_("use a fixed timestamp for uuid
generation"), 2},
{0, 0, 0, 0, 0, 0}
};
@@ -153,6 +155,8 @@ enum {
static error_t
argp_parser (int key, char *arg, struct argp_state *state)
{
+ char *b;
+
if (grub_install_parse (key, arg))
return 0;
switch (key)
@@ -212,6 +216,15 @@ argp_parser (int key, char *arg, struct argp_state *state)
xorriso = xstrdup (arg);
return 0;
+ case 't':
+ fixed_time = strtoll (arg, &b, 10);
+ if (*b !='\0') {
+ printf (_("invalid fixed time number: %s\n"), arg);
+ argp_usage (state);
+ exit (1);
+ }
+ return 0;
+
default:
return ARGP_ERR_UNKNOWN;
}
@@ -541,7 +554,7 @@ main (int argc, char *argv[])
{
time_t tim;
struct tm *tmm;
- tim = time (NULL);
+ tim = fixed_time != -1 ? fixed_time : time (NULL);
tmm = gmtime (&tim);
iso_uuid = xmalloc (55);
grub_snprintf (iso_uuid, 50,
--
2.6.3
- [PATCH 0/3] reproducible builds, Alexander Couzens, 2015/12/04
- [PATCH 1/3] mkstandalone: add argument --fixed-time to override mtime of files, Alexander Couzens, 2015/12/04
- [PATCH 2/3] mkrescue: add argument --fixed-time to get reproducible uuids,
Alexander Couzens <=
- [PATCH 3/3] Makefile: use FIXED_TIMESTAMP for mkstandalone if set, Alexander Couzens, 2015/12/04
- [PATCH v3 0/3] reproducible builds, Alexander Couzens, 2015/12/04
- [PATCH v3 1/3] mkstandalone: add argument --fixed-time to override mtime of files, Alexander Couzens, 2015/12/04
- [PATCH v3 2/3] mkrescue: add argument --fixed-time to get reproducible uuids, Alexander Couzens, 2015/12/04