Module Name: src
Committed By: martin
Date: Tue Jun 25 08:59:52 UTC 2024
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Previous did not work out well - ${INSTIMGBASE} was not always set here
and spaces in the label name confuse the (over simplistic) xen command
line parser. Use (fixed) "NetBSD_ImageRoot" instead for the root partition.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.38 src/distrib/common/bootimage/Makefile.bootimage:1.39
--- src/distrib/common/bootimage/Makefile.bootimage:1.38 Mon Jun 24 07:43:33 2024
+++ src/distrib/common/bootimage/Makefile.bootimage Tue Jun 25 08:59:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.38 2024/06/24 07:43:33 martin Exp $
+# $NetBSD: Makefile.bootimage,v 1.39 2024/06/25 08:59:52 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -548,7 +548,7 @@ ${WORKMBR}:
${DD} if=/dev/zero of=${WORKMBR} seek=$$((${IMAGESECTORS} - 1)) count=1
${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} create
${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
- ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs -l "${INSTIMGBASE} root"
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs -l "NetBSD_ImageRoot"
. if ${SWAPSECTORS} != 0
${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
. endif
