Module Name: src Committed By: rhialto Date: Tue Jul 20 19:27:51 UTC 2021
Modified Files: src/distrib/amd64/liveimage/emuimage: ec2_init Log Message: Don't override /etc/rc.conf if it sets ec2_init. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/emuimage/ec2_init 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/ec2_init diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 src/distrib/amd64/liveimage/emuimage/ec2_init:1.4 --- src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 Thu Jul 15 17:20:25 2021 +++ src/distrib/amd64/liveimage/emuimage/ec2_init Tue Jul 20 19:27:51 2021 @@ -1,4 +1,4 @@ -# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $ +# $NetBSD: ec2_init,v 1.4 2021/07/20 19:27:51 rhialto Exp $ is_ec2() { val=NO @@ -23,4 +23,9 @@ is_ec2() { printf $val } -ec2_init=$(is_ec2) +# Don't override /etc/rc.conf +if [ -z "$ec2_init" ] +then + ec2_init=$(is_ec2) +fi +