diff options
| author | Malte Voos <git@mal.tc> | 2025-02-20 01:03:06 +0100 |
|---|---|---|
| committer | Malte Voos <git@mal.tc> | 2025-02-20 01:05:13 +0100 |
| commit | d47dffedbd77b00fa1d9e76ead3b5c38333eb3f9 (patch) | |
| tree | 03c43d753ad30429aad9105199729d8254bc63e9 | |
| parent | 81929b213ad2445ec3fb41b079e3c6d31f0c3dc7 (diff) | |
| download | reMder-d47dffedbd77b00fa1d9e76ead3b5c38333eb3f9.tar.gz reMder-d47dffedbd77b00fa1d9e76ead3b5c38333eb3f9.zip | |
fix e2fsck error
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 21 | ||||
| -rw-r--r-- | server.nix | 6 |
3 files changed, 30 insertions, 9 deletions
diff --git a/flake.lock b/flake.lock index 019dbe7..f1a530d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739203112, - "narHash": "sha256-ZzJKCz8lnE4CZvIhlVGrC/1pIfjz1HimOAk3Pe4ev1Q=", + "lastModified": 1739995532, + "narHash": "sha256-VLO7dFb+wWP67xx2J2AZUmRgqQVPKgKKCbi1sOoHyM4=", "owner": "malte-v", "repo": "nixpkgs", - "rev": "784f0cc1d9bff0aea7d52771223f68082da8dbe4", + "rev": "70c2893bfff404322b2c200253df28bf59b6f482", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 889e68e..222eb14 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,15 @@ { + inputs = { + nixpkgs.url = "github:malte-v/nixpkgs/raspi3"; + flake-utils.url = "github:numtide/flake-utils"; + }; outputs = - { self }: { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem (system: rec { overlays.default = final: prev: let @@ -27,5 +35,14 @@ { inherit reMder; }; - }; + + packages.default = + let + pkgs = import nixpkgs { + inherit system; + overlays = [ overlays.default ]; + }; + in + pkgs.reMder; + }); } diff --git a/server.nix b/server.nix index eefab38..dc4fcd6 100644 --- a/server.nix +++ b/server.nix @@ -99,7 +99,10 @@ let mkfs vfat /dev/sda1 upload ${rootfsImage} /dev/sda2 resize2fs /dev/sda2 - mkfs ext4 /dev/sda4 + # we disable the orphan_file feature to avoid the error + # '/dev/vda4 has unsupported feature(s): FEATURE_C12' + # when e2fsck runs at boot + mkfs ext4 /dev/sda4 features:^orphan_file mount /dev/sda2 / @@ -142,6 +145,7 @@ writeShellApplication { runtimeInputs = [ qemu ]; text = '' + rm -f ./reMder.qcow2 qemu-img create -b ${diskImage} -F qcow2 -f qcow2 ./reMder.qcow2 qemu-system-aarch64 \ |