commit 99af416e14756d1f4d037486f86f5030e13443b9
parent ad3ef531714d4f9115090c5d44e9a7acc1505ab5
Author: Daniel Barlow <dan@telent.net>
Date: Wed, 19 Apr 2023 21:41:05 +0100
use /bin/sh for init scripts
Diffstat:
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/modules/s6/default.nix b/modules/s6/default.nix
@@ -1,7 +1,6 @@
{ config, pkgs, ... }:
let
inherit (pkgs)
- busybox
execline
s6
s6-init-bin
@@ -16,12 +15,11 @@ let
name = "s6-scripts";
src = ./scripts;
phases = ["unpackPhase" "installPhase" ];
- buildInputs = [busybox];
+ buildInputs = [];
installPhase = ''
mkdir $out
cp -r $src $out/scripts
chmod -R +w $out
- patchShebangs $out/scripts
'';
};
service = dir {
diff --git a/modules/s6/scripts/rc.init b/modules/s6/scripts/rc.init
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
rl="$1"
shift
diff --git a/modules/s6/scripts/rc.shutdown b/modules/s6/scripts/rc.shutdown
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
### Things to do before hardware halt/reboot/poweroff.
diff --git a/modules/s6/scripts/rc.shutdown.final b/modules/s6/scripts/rc.shutdown.final
@@ -1,4 +1,4 @@
-#!/nix/store/xbdqbi2mscmhl5wcpbgpjdwxbsrvpkil-bash-5.1-p16/bin/sh -e
+#!/bin/sh -e
### Things to do *right before* the machine gets rebooted or
### powered off, at the very end of the shutdown sequence,
diff --git a/modules/s6/scripts/runlevel b/modules/s6/scripts/runlevel
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh -e
+#!/bin/sh -e
### This script is called once at boot time by rc.init, and is
### also called by the runleveld service every time the user