X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fuser-event.c;h=cf7f20c599bbefdac3c004834dc75966500a7a4b;hp=dc671d948fb04aa28c80c56caabebda01da3d0f4;hb=922756a3aefd8ba5c5675efd37df9f43938cf432;hpb=6d05fe798a06ba93418a1f8517e8f30cadcfd5e4

diff --git a/discover/user-event.c b/discover/user-event.c
index dc671d9..cf7f20c 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -208,7 +208,7 @@ static char *parse_mac_addr(struct discover_context *ctx, const char *mac)
 			mac_addr_arr + 2, mac_addr_arr + 3, mac_addr_arr + 4,
 			mac_addr_arr + 5);
 
-	mac_addr = talloc_asprintf(ctx, "01-%02X-%02X-%02X-%02X-%02X-%02X",
+	mac_addr = talloc_asprintf(ctx, "01-%02x-%02x-%02x-%02x-%02x-%02x",
 			mac_addr_arr[0], mac_addr_arr[1], mac_addr_arr[2],
 			mac_addr_arr[3], mac_addr_arr[4], mac_addr_arr[5]);
 
@@ -290,8 +290,9 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
 		/* strip filename from the bootfile path, leaving only a
 		 * directory */
 		p = strrchr(basedir, '/');
-		if (p)
-			*p = '\0';
+		if (!p)
+			p = basedir;
+		*p = '\0';
 
 		if (strlen(basedir))
 			url_str = talloc_asprintf_append(url_str, "%s/",