From bc1b7738946bd25d1c77557a33a78919e7eaf619 Mon Sep 17 00:00:00 2001 From: Rhys Oxenham Date: Tue, 21 May 2024 20:12:34 +0200 Subject: [PATCH] Moving to elemental_node_cleanup.sh --- pkg/combustion/elemental_test.go | 2 +- pkg/combustion/templates/31-elemental-register.sh.tpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/combustion/elemental_test.go b/pkg/combustion/elemental_test.go index 7f710e48..63b0be5e 100644 --- a/pkg/combustion/elemental_test.go +++ b/pkg/combustion/elemental_test.go @@ -66,5 +66,5 @@ func TestWriteElementalCombustionScript(t *testing.T) { assert.Contains(t, found, "/etc/systemd/system/elemental-reset.path") assert.Contains(t, found, "/etc/systemd/system/elemental-reset.service") assert.Contains(t, found, "mkdir -p /opt/edge/") - assert.Contains(t, found, "cat <<- \\EOF > /opt/edge/node_cleanup.sh") + assert.Contains(t, found, "cat <<- \\EOF > /opt/edge/elemental_node_cleanup.sh") } diff --git a/pkg/combustion/templates/31-elemental-register.sh.tpl b/pkg/combustion/templates/31-elemental-register.sh.tpl index f96b3879..11e7e6a7 100644 --- a/pkg/combustion/templates/31-elemental-register.sh.tpl +++ b/pkg/combustion/templates/31-elemental-register.sh.tpl @@ -63,7 +63,7 @@ After=network-online.target [Service] Type=simple -ExecStart=/opt/edge/node_cleanup.sh -u +ExecStart=/opt/edge/elemental_node_cleanup.sh -u ExecStartPost=/usr/bin/rm -f /var/lib/elemental/.unmanaged_reset EOF @@ -72,7 +72,7 @@ systemctl enable elemental-register-systemd.service || true systemctl enable elemental-system-agent.service || true mkdir -p /opt/edge/ -cat <<- \EOF > /opt/edge/node_cleanup.sh +cat <<- \EOF > /opt/edge/elemental_node_cleanup.sh #!/usr/bin/env bash # SUSE Edge Elemental Node Reset Script # Copyright 2024 SUSE Software Solutions @@ -156,4 +156,4 @@ rm -f /etc/elemental/state.yaml systemctl restart elemental-register-systemd.service EOF -chmod a+x /opt/edge/node_cleanup.sh +chmod a+x /opt/edge/elemental_node_cleanup.sh