From db260ef6b0c0fb06d584110fbb3ed1671e414a5f Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sat, 21 Dec 2024 00:01:09 +0100
Subject: [PATCH] use the actual init again
---
modules/base.nix | 2 +-
modules/s6/default.nix | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/base.nix b/modules/base.nix
index 7bc9a2be..bfe35f38 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -113,7 +113,7 @@ in {
[ s6 s6-init-bin execline s6-linux-init s6-rc ];
boot.commandLine = [
- "panic=10 oops=panic init=/init loglevel=8 debug"
+ "panic=10 oops=panic init=/bin/init loglevel=8 debug"
"root=${config.hardware.rootDevice}"
"rootfstype=${config.rootfsType}"
"fw_devlink=off"
diff --git a/modules/s6/default.nix b/modules/s6/default.nix
index 7be1ee6e..a530e166 100644
--- a/modules/s6/default.nix
+++ b/modules/s6/default.nix
@@ -292,10 +292,10 @@ in {
};
};
bin = dir {
- #myinit = symlink "${s6-init-bin}/bin/init";
- init = symlink (writeShellScript "myinit.sh" ''
- echo 'tralala'
- '');
+ init = symlink "${s6-init-bin}/bin/init";
+ #init = symlink (writeShellScript "myinit.sh" ''
+ # echo 'tralala'
+ #'');
};
};
};