debugd: remove --debug flag from bootstrapper service created by d…

…ebugd (#3150) Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Jun 6, 2024 · 9c2aef8 · 9c2aef8
1 parent 9a01551
commit 9c2aef8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/debugd/internal/debugd/deploy/service.go b/debugd/internal/debugd/deploy/service.go
@@ -172,7 +172,7 @@ func (s *ServiceManager) OverrideServiceUnitExecStart(ctx context.Context, unitN
 	if strings.Contains(execStart, "\n") || strings.Contains(execStart, "\r") {
 		return fmt.Errorf("execStart must not contain newlines")
 	}
-	overrideUnitContents := fmt.Sprintf("[Service]\nExecStart=\nExecStart=%s $CONSTELLATION_DEBUG_FLAGS\n", execStart)
+	overrideUnitContents := fmt.Sprintf("[Service]\nExecStart=\nExecStart=%s\n", execStart)
 	s.systemdUnitFilewriteLock.Lock()
 	defer s.systemdUnitFilewriteLock.Unlock()
 	path := filepath.Join(systemdUnitFolder, unitName+".service.d", "override.conf")

diff --git a/debugd/internal/debugd/deploy/service_test.go b/debugd/internal/debugd/deploy/service_test.go
@@ -218,7 +218,7 @@ func TestOverrideServiceUnitExecStart(t *testing.T) {
 			},
 			unitName:         "test",
 			execStart:        "/run/state/bin/test",
-			wantFileContents: "[Service]\nExecStart=\nExecStart=/run/state/bin/test $CONSTELLATION_DEBUG_FLAGS\n",
+			wantFileContents: "[Service]\nExecStart=\nExecStart=/run/state/bin/test\n",
 			wantActionCalls: []dbusConnActionInput{
 				{name: "test.service", mode: "replace"},
 			},
@@ -264,7 +264,7 @@ func TestOverrideServiceUnitExecStart(t *testing.T) {
 			},
 			unitName:         "test",
 			execStart:        "/run/state/bin/test",
-			wantFileContents: "[Service]\nExecStart=\nExecStart=/run/state/bin/test $CONSTELLATION_DEBUG_FLAGS\n",
+			wantFileContents: "[Service]\nExecStart=\nExecStart=/run/state/bin/test\n",
 			wantActionCalls: []dbusConnActionInput{
 				{name: "test.service", mode: "replace"},
 			},