fixup! overlord/fdestate/fdestate.go: fix path to data mount point on…

… hybrid
canonical · Nov 21, 2024 · 491569b · 491569b
1 parent 457e84e
commit 491569b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/dirs/dirs.go b/dirs/dirs.go
@@ -142,7 +142,10 @@ var (
 
 	FeaturesDir string
 
-	RootDataDir string
+	// WritableMountPath is a path where writable root data is
+	// mounted. For Classic it is /, but Ubuntu Core it is
+	// /writable.
+	WritableMountPath string
 )
 
 // User defined home directory variables
@@ -639,10 +642,10 @@ func SetRootDir(rootdir string) {
 
 	if release.OnClassic {
 		// On Classic, the data disk is mounted as /
-		RootDataDir = rootdir
+		WritableMountPath = rootdir
 	} else {
 		// If on Core /writable is a bind mount from data dir
-		RootDataDir = filepath.Join(rootdir, "writable")
+		WritableMountPath = filepath.Join(rootdir, "writable")
 	}
 
 }

diff --git a/dirs/dirs_test.go b/dirs/dirs_test.go
@@ -291,16 +291,16 @@ func (s *DirsTestSuite) TestLibexecdirOpenSUSEFlavors(c *C) {
 	c.Check(dirs.DistroLibExecDir, Equals, "/usr/libexec/snapd")
 }
 
-func (s *DirsTestSuite) TestRootDataDir(c *C) {
+func (s *DirsTestSuite) TestWritableMountPath(c *C) {
 	release.MockOnClassic(true)
 	dirs.SetRootDir("/")
 
-	c.Check(dirs.RootDataDir, Equals, "/")
+	c.Check(dirs.WritableMountPath, Equals, "/")
 }
 
-func (s *DirsTestSuite) TestRootDataDirCore(c *C) {
+func (s *DirsTestSuite) TestWritableMountPathCore(c *C) {
 	release.MockOnClassic(false)
 	dirs.SetRootDir("/")
 
-	c.Check(dirs.RootDataDir, Equals, "/writable")
+	c.Check(dirs.WritableMountPath, Equals, "/writable")
 }
diff --git a/overlord/fdestate/fdestate.go b/overlord/fdestate/fdestate.go
@@ -218,7 +218,7 @@ func initializeState(st *state.State) error {
 
 	// FIXME mount points will be different in recovery or factory-reset modes
 	// either inspect degraded.json, or use boot.HostUbuntuDataForMode()
-	dataUUID, dataErr := disksDMCryptUUIDFromMountPoint(dirs.RootDataDir)
+	dataUUID, dataErr := disksDMCryptUUIDFromMountPoint(dirs.WritableMountPath)
 	saveUUID, saveErr := disksDMCryptUUIDFromMountPoint(dirs.SnapSaveDir)
 	if errors.Is(saveErr, disks.ErrMountPointNotFound) {
 		// TODO: do we need to care about old cases where there is no save partition?