Greenboot rs continued personal

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+FROM fedora:latest
+
+RUN bash -c "$(curl -fsSL "https://raw.githubusercontent.com/microsoft/vscode-dev-containers/main/script-library/common-redhat.sh")" -- "true" "vscode" "1000" "1000" "true"
+
+RUN dnf install -y \
+    sudo git cargo rust rust-src git-core clippy rustfmt \
+    && dnf clean all
+
+USER vscode

.devcontainer/devcontainer.json

@@ -0,0 +1,28 @@
+{
+	"name": "greenboot-rs",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"runArgs": [
+		"--cap-add=SYS_PTRACE",
+		"--security-opt",
+		"seccomp=unconfined"
+	],
+	"settings": {
+		"rust-analyzer.checkOnSave.command": "clippy"
+	},
+	"extensions": [
+		"mutantdino.resourcemonitor",
+		"matklad.rust-analyzer",
+		"serayuzgur.crates"
+	],
+	"hostRequirements": {
+		"memory": "4gb"
+	},
+	"remoteUser": "vscode",
+	"updateContentCommand": [
+		"cargo",
+		"build"
+	],
+	"waitFor": "onCreateCommand"
+}

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-    - main
+    - greenboot-rs
   pull_request:
 
 name: Continuous integration
@@ -22,20 +22,18 @@ jobs:
           skip: "./docs/Gemfile.lock,./docs/_config.yml,./.github,./.git,./greenboot.spec,./dist"
 
   fmt:
-    name: Rustfmt
+    name: Cargo fmt
     runs-on: ubuntu-latest
+    container: fedora:latest
     steps:
+      - name: Install deps
+        run: |
+          dnf install -y cargo rustfmt
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: --all -- --check
+          args: --check --all
 
   clippy:
     name: Clippy
@@ -63,11 +61,13 @@ jobs:
 
   build_and_test:
     runs-on: ubuntu-latest
-    container: fedora:latest
+    container: 
+      image: fedora:latest
+      options: --user root
     steps:
       - name: Install deps
         run: |
-          dnf install -y make gcc git cargo rust git clevis
+          dnf install -y make gcc git cargo rust git grub2-efi grub2-efi-modules shim
       - uses: actions/checkout@v3
         with:
           persist-credentials: false
@@ -91,30 +91,8 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-      # This is primarily to ensure that changes to fdo_data.h are committed,
-      # which is critical for determining whether any stability changes were made
-      # during the PR review.
-      - name: Ensure building did not change any code
-        run: |
-          git diff --exit-code
-
-  commitlint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 'latest'
-      - name: Install commitlint dependencies
-        run: npm install commitlint
-      - uses: wagoid/commitlint-github-action@v5
-        env:
-          NODE_PATH: ${{ github.workspace }}/node_modules
-        with:
-          configFile: .github/commitlint.config.js
-          failOnWarnings: true
+          args: -- --test-threads=1
+
 
   # manpages:
   #   name: Test man page generation
@@ -136,6 +114,6 @@ jobs:
   #     - name: Install devcontainer CLI
   #       run: npm install -g @vscode/dev-container-cli
   #     - name: Build devcontainer
-  #       run: devcontainer build --image-name devcontainer-fdo-rs .
+  #       run: devcontainer build --image-name greenboot-rs .
   #     - name: Test building in devcontainer
-  #       run: docker run --rm -v `pwd`:/code:z --workdir /code --user root devcontainer-fdo-rs cargo build --verbose
+  #       run: docker run --rm -v `pwd`:/code:z --workdir /code --user root greenboot-rs cargo build --verbose

Cargo.toml

@@ -11,7 +11,8 @@ log = "0.4"
 clap = { version = "4.0", features = ["derive"] }
 config = "0.13"
 pretty_env_logger = "0.4"
-nix = "0.25.0"
+nix = "0.26.2"
 glob = "0.3.0"
 serde = "1.0"
 serde_json = "1.0"
+thiserror = "1.0.38"

Makefile

@@ -16,7 +16,7 @@ else
 endif
 
 .PHONY: all
-all: build check
+all: build test
 
 $(RPM_SPECFILE):
 	mkdir -p $(CURDIR)/rpmbuild/SPECS
@@ -40,9 +40,9 @@ install: build
 	install -D -t ${DESTDIR}/usr/libexec "${TARGETDIR}/${PROFILE}/greenboot"
 	install -D -m 644 -t ${DESTDIR}/usr/lib/systemd/system dist/systemd/system/*.service
 
-.PHONY: check
-check:
-	cargo test "--target-dir=${TARGETDIR}"
+.PHONY: test
+test:
+	cargo test "--target-dir=${TARGETDIR}" -- --test-threads=1
 
 .PHONY: srpm
 srpm: $(RPM_SPECFILE) $(RPM_TARBALL) $(VENDOR_TARBALL)

dist/systemd/system/greenboot-rollback.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Greenboot rollback
+Requires=dbus.service
+RequiresMountsFor=/boot
+After=systemd-update-done.service
+BindsTo=systemd-update-done.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/libexec/greenboot/greenboot rollback
+Restart=no
+
+[Install]
+WantedBy=multi-user.target

dist/systemd/system/greenboot.service

@@ -1,13 +1,17 @@
 [Unit]
-Description=Greenboot - TODO
-After=multi-user.target
-Before=boot-complete.target
+Description=greenboot Health Checks Runner
+DefaultDependencies=no
+Before=boot-complete.target systemd-update-done.service
+OnFailureJobMode=fail
+RequiresMountsFor=/boot
+RequiresMountsFor=/etc
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/libexec/greenboot/greenboot check
+ExecStart=/usr/libexec/greenboot/greenboot health-check
 Restart=no
 
 [Install]
 RequiredBy=boot-complete.target
+WantedBy=multi-user.target

etc/greenboot/greenboot.conf

@@ -0,0 +1,4 @@
+# Greenboot configuration file
+
+## Generic
+GREENBOOT_MAX_BOOT_ATTEMPTS=1