From 1565a8414dfd1c9d1f52cf6003a08f4b54a26674 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Mon, 6 Mar 2023 17:48:17 +0000
Subject: [PATCH] remove inadvertant references to bash
---
pkgs/ifwait/default.nix | 2 ++
pkgs/liminix-tools/networking/udhcpc.nix | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/ifwait/default.nix b/pkgs/ifwait/default.nix
index ce9ba85..bc21ef4 100644
--- a/pkgs/ifwait/default.nix
+++ b/pkgs/ifwait/default.nix
@@ -25,6 +25,8 @@ in stdenv.mkDerivation rec {
makeWrapper ${lua}/bin/lua $out/bin/${pname} \
--prefix LUA_CPATH ";" ${netlink}/lib/lua/${lua.luaversion}/\?.so \
--add-flags $out/lib/${pname}.lua
+ # makeWrapper adds a shebang for bash
+ sed -i -e '1c#!/bin/sh' $out/bin/${pname}
'';
}
diff --git a/pkgs/liminix-tools/networking/udhcpc.nix b/pkgs/liminix-tools/networking/udhcpc.nix
index b55a489..080f563 100644
--- a/pkgs/liminix-tools/networking/udhcpc.nix
+++ b/pkgs/liminix-tools/networking/udhcpc.nix
@@ -1,7 +1,7 @@
{
liminix
, busybox
-, writeShellScript
+, writeAshScript
, serviceFns
} :
let
@@ -10,7 +10,9 @@ in
interface: { ... } @ args:
let
name = "${interface.device}.udhcp";
- script = writeShellScript "udhcp-notify" ''
+ script = writeAshScript "udhcp-notify" {
+ # runtimeInputs = [ iproute2 ] using busybox version of ip
+ } ''
. ${serviceFns}
action=$1