Module Name: src
Committed By: martin
Date: Wed Jun 26 09:13:47 UTC 2024
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Now that we label GPT partitions, adjust the generated fdisk to match.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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.40 src/distrib/common/bootimage/Makefile.bootimage:1.41
--- src/distrib/common/bootimage/Makefile.bootimage:1.40 Tue Jun 25 09:07:14 2024
+++ src/distrib/common/bootimage/Makefile.bootimage Wed Jun 26 09:13:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.40 2024/06/25 09:07:14 martin Exp $
+# $NetBSD: Makefile.bootimage,v 1.41 2024/06/26 09:13:47 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -330,12 +330,12 @@ ${WORKFSTAB}:
.if ${USE_GPT} != "no"
. if ${SWAPSECTORS} != 0
${TOOL_SED} \
- -e "s/ROOT.a/NAME=${BOOTDISK_UUID}/" \
- -e "s/ROOT.b/NAME=${SWAPDISK_UUID}/" \
+ -e "s/ROOT.a/NAME=NBImgRoot/" \
+ -e "s/ROOT.b/NAME=NBImgSwap/" \
< ${FSTAB_IN} > ${WORKFSTAB}
. else
${TOOL_SED} \
- -e "s/ROOT.a/NAME=${BOOTDISK_UUID}/" \
+ -e "s/ROOT.a/NAME=NBImgRoot/" \
-e "/ROOT.b/d" \
< ${FSTAB_IN} > ${WORKFSTAB}
. endif
@@ -550,7 +550,7 @@ ${WORKMBR}:
${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 "NBImgRoot"
. if ${SWAPSECTORS} != 0
- ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap -l "NBImgSwap"
. endif
.elif ${USE_MBR} != "no"
@echo creating MBR labels...
