diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-03 17:49:01 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-03 17:49:01 -0500 |
| commit | fa5c11836cec515dd23efcfabe9b736edd47c22a (patch) | |
| tree | 82f96f0d566483e56b184e290bc573d4de6f147c /systemd/cloud-init-generator | |
| parent | 72c71196d701a1398963b52a30e9ab34a2579a49 (diff) | |
| download | vyos-cloud-init-fa5c11836cec515dd23efcfabe9b736edd47c22a.tar.gz vyos-cloud-init-fa5c11836cec515dd23efcfabe9b736edd47c22a.zip | |
generator: be more clear on where kernel cmdline came from
Diffstat (limited to 'systemd/cloud-init-generator')
| -rwxr-xr-x | systemd/cloud-init-generator | 5 |
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 " |