chore: fix some systemd things + a couple todos

Signed-off-by: Antonio Murdaca <[email protected]>
fedora-iot · Sep 30, 2022 · dd27f68 · dd27f68
1 parent 13cc0f2
commit dd27f68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/dist/systemd/system/greenboot-grub2-set-counter.service b/dist/systemd/system/greenboot-grub2-set-counter.service
@@ -6,7 +6,8 @@ Before=ostree-finalize-staged.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/libexec/greenboot set-counter
+ExecStart=/usr/libexec/greenboot/greenboot set-counter
+MountFlags=slave
 
 [Install]
 RequiredBy=ostree-finalize-staged.service
diff --git a/dist/systemd/system/greenboot.service b/dist/systemd/system/greenboot.service
@@ -8,7 +8,7 @@ Before=shutdown.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/libexec/greenboot check
+ExecStart=/usr/libexec/greenboot/greenboot check
 MountFlags=slave
 
 [Install]

diff --git a/src/main.rs b/src/main.rs
@@ -52,6 +52,8 @@ struct CheckArguments {}
 struct SetCounterArguments {}
 
 fn check(_args: &CheckArguments) -> Result<(), Error> {
+    // TODO: run only if boot_success=0 && boot_counter != "" || empty too
+
     // TODO: logic for watchdog
     if is_boot_wd_triggered()? {
         // do something for wd triggered boot
@@ -60,6 +62,7 @@ fn check(_args: &CheckArguments) -> Result<(), Error> {
     let grub2_editenv_list = parse_grub2_editenv_list()?;
     if let Some(v) = grub2_editenv_list.get("boot_counter") {
         if v == "-1" {
+            // TODO: cleanup "bad" upgrade deployment, there's a command I don't remember...
             Command::new("rpm-ostree").arg("rollback").status()?;
             Command::new("grub2-editenv")
                 .arg("-")
@@ -106,6 +109,7 @@ fn check(_args: &CheckArguments) -> Result<(), Error> {
         return Ok(());
     }
     // TODO: run green checks...
+    // TODO: if we are here, we need to cleanup all other previous deployments
     Command::new("grub2-editenv")
         .arg("-")
         .arg("set")