From 42923ffbbf6a84819224417f0e032497af60d0cd Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Mon, 12 Feb 2018 15:10:25 -0700
Subject: ds-identify: check /writable/system-data/ for nocloud seed.

Ubuntu core seeds information to nocloud via a bind-mount of
/writable/system-data/var/lib/cloud over /var/lib/cloud.
When ds-identify runs as a systemd generator that mount is not
guaranteed to have been done.  It is guaranteed at
cloud-init-local.service time, but not generator time.

Images built with 'ubuntu-image --cloud-init=user-data-file'
would have cloud-init disabled.

The fix here is just to consider the seed dir under /writable/system-data.

LP: #1747070
---
 tools/ds-identify | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'tools')

diff --git a/tools/ds-identify b/tools/ds-identify
index cd268242..5f762438 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -470,6 +470,16 @@ check_seed_dir() {
     return 0
 }
 
+check_writable_seed_dir() {
+    # ubuntu core bind-mounts /writable/system-data/var/lib/cloud
+    # over the top of /var/lib/cloud, but the mount might not be done yet.
+    local wdir="/writable/system-data"
+    [ -d "${PATH_ROOT}$wdir" ] || return 1
+    local sdir="${PATH_ROOT}$wdir${PATH_VAR_LIB_CLOUD#${PATH_ROOT}}"
+    local PATH_VAR_LIB_CLOUD="$sdir"
+    check_seed_dir "$@"
+}
+
 probe_floppy() {
     cached "${STATE_FLOPPY_PROBED}" && return "${STATE_FLOPPY_PROBED}"
     local fpath=/dev/floppy
@@ -569,6 +579,7 @@ dscheck_NoCloud() {
     esac
     for d in nocloud nocloud-net; do
         check_seed_dir "$d" meta-data user-data && return ${DS_FOUND}
+        check_writable_seed_dir "$d" meta-data user-data && return ${DS_FOUND}
     done
     if has_fs_with_label "${fslabel}"; then
         return ${DS_FOUND}
-- 
cgit v1.2.3