CVS commit: [netbsd-10] src/distrib/utils/embedded/files

2024-02-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Feb  4 10:59:54 UTC 2024

Modified Files:
src/distrib/utils/embedded/files [netbsd-10]: creds_msdos

Log Message:
Pull up following revision(s) (requested by mrg in ticket #580):

distrib/utils/embedded/files/creds_msdos: revision 1.6

properly quote arguments.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/utils/embedded/files/creds_msdos

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/files/creds_msdos
diff -u src/distrib/utils/embedded/files/creds_msdos:1.5 src/distrib/utils/embedded/files/creds_msdos:1.5.2.1
--- src/distrib/utils/embedded/files/creds_msdos:1.5	Sat Dec 11 19:24:18 2021
+++ src/distrib/utils/embedded/files/creds_msdos	Sun Feb  4 10:59:54 2024
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: creds_msdos,v 1.5 2021/12/11 19:24:18 mrg Exp $
+# $NetBSD: creds_msdos,v 1.5.2.1 2024/02/04 10:59:54 martin Exp $
 #
 # Copyright (c) 2019 Matthew R. Green
 # All rights reserved.
@@ -153,7 +153,7 @@ creds_msdos_start()
 	if [ -f "${creds_file}" ]; then
 		while read type user args; do
 			# strip cr
-			local clean_args=$(echo "$args" | tr -d '\015')
+			local clean_args="$(echo "$args" | tr -d '\015')"
 			case "$type" in
 			\#*|'')
 continue



CVS commit: [netbsd-10] src/distrib/utils/embedded/files

2024-02-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Feb  4 10:59:54 UTC 2024

Modified Files:
src/distrib/utils/embedded/files [netbsd-10]: creds_msdos

Log Message:
Pull up following revision(s) (requested by mrg in ticket #580):

distrib/utils/embedded/files/creds_msdos: revision 1.6

properly quote arguments.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/utils/embedded/files/creds_msdos

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-10] src/distrib/utils/embedded/files

2023-10-02 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Oct  2 13:27:41 UTC 2023

Modified Files:
src/distrib/utils/embedded/files [netbsd-10]: ec2_init

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #382):

distrib/utils/embedded/files/ec2_init: revision 1.6

ec2_init: Suppress error message for nonexistent sysctl.

We're querying to see whether the sysctl node is available and if so
what its text is, not interested in the error message.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/utils/embedded/files/ec2_init

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-10] src/distrib/utils/embedded/files

2023-10-02 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Oct  2 13:27:41 UTC 2023

Modified Files:
src/distrib/utils/embedded/files [netbsd-10]: ec2_init

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #382):

distrib/utils/embedded/files/ec2_init: revision 1.6

ec2_init: Suppress error message for nonexistent sysctl.

We're querying to see whether the sysctl node is available and if so
what its text is, not interested in the error message.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/distrib/utils/embedded/files/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/utils/embedded/files/ec2_init
diff -u src/distrib/utils/embedded/files/ec2_init:1.5 src/distrib/utils/embedded/files/ec2_init:1.5.2.1
--- src/distrib/utils/embedded/files/ec2_init:1.5	Sat Oct 15 18:32:30 2022
+++ src/distrib/utils/embedded/files/ec2_init	Mon Oct  2 13:27:41 2023
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ec2_init,v 1.5 2022/10/15 18:32:30 jmcneill Exp $
+# $NetBSD: ec2_init,v 1.5.2.1 2023/10/02 13:27:41 martin Exp $
 #
 # PROVIDE: ec2_init
 # REQUIRE: NETWORKING
@@ -15,7 +15,7 @@ stop_cmd=":"
 
 CLOUD_TYPE=EC2	# default
 
-case "$(/sbin/sysctl -n machdep.dmi.chassis-asset-tag)" in
+case "$(/sbin/sysctl -n machdep.dmi.chassis-asset-tag 2>/dev/null)" in
 OracleCloud*)
 	CLOUD_TYPE=OCI
 	;;