Module Name: src
Committed By: jmcneill
Date: Wed Jul 5 01:09:17 UTC 2017
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.c
Log Message:
Load address is not required for "ramdisk" images.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/mkubootimage/mkubootimage.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.18 src/usr.bin/mkubootimage/mkubootimage.c:1.19
--- src/usr.bin/mkubootimage/mkubootimage.c:1.18 Tue Sep 30 10:21:50 2014
+++ src/usr.bin/mkubootimage/mkubootimage.c Wed Jul 5 01:09:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.18 2014/09/30 10:21:50 msaitoh Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.19 2017/07/05 01:09:17 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.18 2014/09/30 10:21:50 msaitoh Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.19 2017/07/05 01:09:17 jmcneill Exp $");
#include <sys/mman.h>
#include <sys/stat.h>
@@ -429,7 +429,8 @@ main(int argc, char *argv[])
if (image_arch == IH_ARCH_UNKNOWN ||
image_type == IH_TYPE_UNKNOWN ||
- (image_type != IH_TYPE_SCRIPT && image_loadaddr == 0) ||
+ (image_type != IH_TYPE_SCRIPT && image_type != IH_TYPE_RAMDISK &&
+ image_loadaddr == 0) ||
image_name == NULL)
usage();
