Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/amd64/liveimage/emuimage Don't override /etc/rc.conf...
details: https://anonhg.NetBSD.org/src/rev/b0500e1781ed
branches: trunk
changeset: 984736:b0500e1781ed
user: rhialto <rhialto%NetBSD.org@localhost>
date: Tue Jul 20 19:27:51 2021 +0000
description:
Don't override /etc/rc.conf if it sets ec2_init.
diffstat:
distrib/amd64/liveimage/emuimage/ec2_init | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diffs (20 lines):
diff -r e9f525eea1e4 -r b0500e1781ed distrib/amd64/liveimage/emuimage/ec2_init
--- a/distrib/amd64/liveimage/emuimage/ec2_init Tue Jul 20 18:43:06 2021 +0000
+++ b/distrib/amd64/liveimage/emuimage/ec2_init Tue Jul 20 19:27:51 2021 +0000
@@ -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 @@
printf $val
}
-ec2_init=$(is_ec2)
+# Don't override /etc/rc.conf
+if [ -z "$ec2_init" ]
+then
+ ec2_init=$(is_ec2)
+fi
+
Home |
Main Index |
Thread Index |
Old Index