Move state to /state/deploy

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

crates/cfsctl/src/main.rs

@@ -303,7 +303,7 @@ async fn main() -> Result<()> {
                     .as_ref()
                     .map(|p: &PathBuf| p.parent().unwrap())
                     .unwrap_or(Path::new("/sysroot"))
-                    .join("state")
+                    .join("state/deploy")
                     .join(id.to_hex());
 
                 create_dir_all(state.join("var"))?;

crates/composefs-setup-root/src/main.rs

@@ -257,7 +257,7 @@ fn setup_root(args: Args) -> Result<()> {
     }
 
     // etc + var
-    let state = open_dir(open_dir(&sysroot, "state")?, image.to_hex())?;
+    let state = open_dir(open_dir(&sysroot, "state/deploy")?, image.to_hex())?;
     mount_subdir(&new_root, &state, "etc", config.etc, MountType::Overlay)?;
     mount_subdir(&new_root, &state, "var", config.var, MountType::Bind)?;
 

crates/composefs/tests/test.sh

@@ -35,7 +35,7 @@ EOF
 blkdev="$(mkd "${top}/blkdev")"
 repo="$(mkd "${blkdev}/composefs")"
 state="$(mkd "${blkdev}/state")"
-deployment="$(mkd "${state}/${imageid}")"
+deployment="$(mkd "${state}/deploy/${imageid}")"
 dply_etc="$(mkd "${deployment}/etc")"
 dply_etc_u="$(mkd "${dply_etc}/upper")"
 dply_etc_w="$(mkd "${dply_etc}/work")"

examples/common/run-repart

@@ -4,8 +4,8 @@ set -eux
 
 chown -R 0:0 tmp/sysroot
 chcon -R system_u:object_r:usr_t:s0 tmp/sysroot/composefs
-chcon system_u:object_r:var_t:s0 tmp/sysroot/state/*/var
-chcon system_u:object_r:etc_t:s0 tmp/sysroot/state/*/etc/*
+chcon system_u:object_r:var_t:s0 tmp/sysroot/state/deploy/*/var
+chcon system_u:object_r:etc_t:s0 tmp/sysroot/state/deploy/*/etc/*
 
 definitions='tmp/repart.d'
 export SYSTEMD_REPART_MKFS_OPTIONS_EXT4='-O verity'