Module Name: src Committed By: maya Date: Tue Apr 16 16:13:45 UTC 2024
Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage spec.emuimage Log Message: restore amd64 live image support for resize root after combined mbr/gpt commit we need to resize_gpt now, as it takes precedence over mbr/disklabel this change brings us to behave like the evbarm images. XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether that has any negative repercussions, maybe another system might regard MBR as the sole source of truth when GPT also exists. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/amd64/liveimage/emuimage/Makefile diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.9 src/distrib/amd64/liveimage/emuimage/Makefile:1.10 --- src/distrib/amd64/liveimage/emuimage/Makefile:1.9 Sat Jul 24 16:13:44 2021 +++ src/distrib/amd64/liveimage/emuimage/Makefile Tue Apr 16 16:13:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $ +# $NetBSD: Makefile,v 1.10 2024/04/16 16:13:44 maya Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img @@ -13,6 +13,6 @@ SPEC_EXTRA= ${.CURDIR}/spec.emuimage RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage IMGFILE_EXTRA= \ ${FILESDIR}/ec2_init etc/rc.d/ec2_init \ - ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel + ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt .include "${.CURDIR}/../Makefile.liveimage" Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.4 --- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 Wed Sep 27 00:24:12 2023 +++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Tue Apr 16 16:13:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf.emuimage,v 1.3 2023/09/27 00:24:12 riastradh Exp $ +# $NetBSD: rc.conf.emuimage,v 1.4 2024/04/16 16:13:44 maya Exp $ is_ec2() { val=NO @@ -25,7 +25,7 @@ is_ec2() { } certctl_init=YES -resize_disklabel=YES +resize_gpt=YES resize_root=YES resize_root_flags="-p" resize_root_postcmd="/sbin/reboot -n" Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.3 --- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 Sat Jul 24 16:13:44 2021 +++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Tue Apr 16 16:13:44 2024 @@ -1,3 +1,3 @@ -# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $ +# $NetBSD: spec.emuimage,v 1.3 2024/04/16 16:13:44 maya Exp $ ./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel -./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel +./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel