Also clean old debconf and dpkg conf

canonical · Oct 17, 2023 · 84a2e75 · 84a2e75
1 parent 229f664
commit 84a2e75
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/internal/statemachine/classic_states.go b/internal/statemachine/classic_states.go
@@ -1431,6 +1431,20 @@ func (stateMachine *StateMachine) cleanRootfs() error {
 
 	toClean = append(toClean, sshPrivKeys...)
 
+	oldDebconf, err := filepath.Glob(filepath.Join(stateMachine.tempDirs.chroot, "var", "cache", "debconf", "*-old"))
+	if err != nil {
+		return fmt.Errorf("unable to list old debconf conf: %s", err.Error())
+	}
+
+	toClean = append(toClean, oldDebconf...)
+
+	oldDpkg, err := filepath.Glob(filepath.Join(stateMachine.tempDirs.chroot, "var", "lib", "dpkg", "*-old"))
+	if err != nil {
+		return fmt.Errorf("unable to list old dpkg conf: %s", err.Error())
+	}
+
+	toClean = append(toClean, oldDpkg...)
+
 	for _, f := range toClean {
 		err = osRemove(f)
 		if err != nil && !os.IsNotExist(err) {

diff --git a/internal/statemachine/classic_test.go b/internal/statemachine/classic_test.go
@@ -4134,8 +4134,8 @@ func TestStateMachine_defaultLocaleFailures(t *testing.T) {
 	})
 }
 
-func TestStateMachine_cleanRootfs(t *testing.T) {
-	t.Run("test_clean_rootfs", func(t *testing.T) {
+func TestClassicStateMachine_cleanRootfs_real_rootfs(t *testing.T) {
+	t.Run("test_clean_rootfs_real_rootfs", func(t *testing.T) {
 		asserter := helper.Asserter{T: t}
 		restoreCWD := helper.SaveCWD()
 		t.Cleanup(restoreCWD)
@@ -4177,6 +4177,9 @@ func TestStateMachine_cleanRootfs(t *testing.T) {
 		err = stateMachine.installPackages()
 		asserter.AssertErrNil(err, true)
 
+		err = stateMachine.cleanRootfs()
+		asserter.AssertErrNil(err, true)
+
 		// Check cleaned files were removed
 		cleaned := []string{
 			filepath.Join(stateMachine.tempDirs.chroot, "etc", "machine-id"),
@@ -4266,6 +4269,8 @@ func TestClassicStateMachine_cleanRootfs(t *testing.T) {
 				filepath.Join("var", "lib", "dbus", "machine-id"),
 				filepath.Join("etc", "udev", "rules.d", "test-persistent-net.rules"),
 				filepath.Join("etc", "udev", "rules.d", "test2-persistent-net.rules"),
+				filepath.Join("var", "cache", "debconf", "test-old"),
+				filepath.Join("var", "lib", "dpkg", "testdpkg-old"),
 			},
 			wantRootfsContent: map[string]int64{
 				filepath.Join("etc", "udev", "rules.d", "test-persistent-net.rules"):  0,
@@ -4287,11 +4292,15 @@ func TestClassicStateMachine_cleanRootfs(t *testing.T) {
 				filepath.Join("etc", "machine-id"),
 				filepath.Join("var", "lib", "dbus", "machine-id"),
 				filepath.Join("etc", "udev", "rules.d", "test-persistent-net.rules"),
+				filepath.Join("var", "cache", "debconf", "test-old"),
+				filepath.Join("var", "lib", "dpkg", "testdpkg-old"),
 			},
 			wantRootfsContent: map[string]int64{
 				filepath.Join("etc", "machine-id"):                                   sampleSize,
 				filepath.Join("var", "lib", "dbus", "machine-id"):                    sampleSize,
 				filepath.Join("etc", "udev", "rules.d", "test-persistent-net.rules"): sampleSize,
+				filepath.Join("var", "cache", "debconf", "test-old"):                 sampleSize,
+				filepath.Join("var", "lib", "dpkg", "testdpkg-old"):                  sampleSize,
 			},
 		},
 		{