summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-03 17:49:01 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-03 17:49:01 -0500
commitfa5c11836cec515dd23efcfabe9b736edd47c22a (patch)
tree82f96f0d566483e56b184e290bc573d4de6f147c
parent72c71196d701a1398963b52a30e9ab34a2579a49 (diff)
downloadvyos-cloud-init-fa5c11836cec515dd23efcfabe9b736edd47c22a.tar.gz
vyos-cloud-init-fa5c11836cec515dd23efcfabe9b736edd47c22a.zip
generator: be more clear on where kernel cmdline came from
-rwxr-xr-xsystemd/cloud-init-generator5
1 files changed, 4 insertions, 1 deletions
diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator
index 3bd2d6b3..eb0e1a77 100755
--- a/systemd/cloud-init-generator
+++ b/systemd/cloud-init-generator
@@ -33,15 +33,18 @@ etc_file() {
read_proc_cmdline() {
if [ "$CONTAINER" = "lxc" ]; then
+ _RET_MSG="ignored: \$container=$CONTAINER"
_RET=""
return 0
fi
if systemd-detect-virt --container --quiet; then
+ _RET_MSG="ignored: detect-virt is container"
_RET=""
return 0
fi
+ _RET_MSG="/proc/cmdline"
read _RET < /proc/cmdline
}
@@ -53,7 +56,7 @@ kernel_cmdline() {
debug 1 "kernel command line from env KERNEL_CMDLINE: $cmdline"
elif read_proc_cmdline; then
read_proc_cmdline && cmdline="$_RET"
- debug 1 "kernel command line from /proc/cmdline: $cmdline"
+ debug 1 "kernel command line ($_RET_MSG): $cmdline"
fi
_RET="unset"
cmdline=" $cmdline "