Merge pull request #171 from masnax/content-interface-ceph

snapcraft/commands: Setup /etc in common file
canonical · Sep 29, 2023 · 010916e · 010916e
2 parents d35e624 + 4863877
commit 010916e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/snapcraft/commands/daemon.start b/snapcraft/commands/daemon.start
@@ -295,6 +295,8 @@ echo "==> Setting up ceph configuration"
 if [ "${ceph_builtin:-"false"}" = "true" ]; then
     mkdir -p "${SNAP_COMMON}/ceph"
     ln -s "${SNAP_COMMON}/ceph" /etc/ceph
+elif [ -e "/var/snap/microceph" ]; then
+    ln -s /var/snap/microceph/current/conf/ /etc/ceph
 else
     ln -s /var/lib/snapd/hostfs/etc/ceph /etc/ceph
 fi

diff --git a/snapcraft/hooks/connect-plug-ceph-conf b/snapcraft/hooks/connect-plug-ceph-conf
@@ -30,8 +30,11 @@ get_bool() {
     return
 }
 
-ceph_builtin=$(get_bool "$(snapctl get ceph.builtin)")
+# Only create symlinks if /etc has been generated by daemon.start.
+if [ -e "/etc/.lxd_generated" ]; then
+  ceph_builtin=$(get_bool "$(snapctl get ceph.builtin)")
 
-if ! [ "${ceph_builtin:-"false"}" = "true" ]; then
-  ln -snf ${SNAP_DATA}/microceph/conf/ /etc/ceph
+  if ! [ "${ceph_builtin:-"false"}" = "true" ]; then
+    ln -snf ${SNAP_DATA}/microceph/conf/ /etc/ceph
+  fi
 fi
diff --git a/snapcraft/hooks/disconnect-plug-ceph-conf b/snapcraft/hooks/disconnect-plug-ceph-conf
@@ -30,11 +30,14 @@ get_bool() {
     return
 }
 
-ceph_builtin=$(get_bool "$(snapctl get ceph.builtin)")
+# Only create symlinks if /etc has been generated by daemon.start.
+if [ -e "/etc/.lxd_generated" ]; then
+  ceph_builtin=$(get_bool "$(snapctl get ceph.builtin)")
 
-if [ "${ceph_builtin:-"false"}" = "true" ]; then
-    mkdir -p "${SNAP_COMMON}/ceph"
-    ln -snf "${SNAP_COMMON}/ceph" /etc/ceph
-else
-    ln -snf /var/lib/snapd/hostfs/etc/ceph /etc/ceph
+  if [ "${ceph_builtin:-"false"}" = "true" ]; then
+      mkdir -p "${SNAP_COMMON}/ceph"
+      ln -snf "${SNAP_COMMON}/ceph" /etc/ceph
+  else
+      ln -snf /var/lib/snapd/hostfs/etc/ceph /etc/ceph
+  fi
 fi