From 04060e0a59c072315b7b5106af27aab248e74b75 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 28 Apr 2022 11:28:08 +0000
Subject: Remove s6-portable-utils

Not worth pulling this in any more just for another mkdir
implementation!
---
 host/rootfs/default.nix                          | 6 +++---
 host/rootfs/etc/s6-linux-init/scripts/rc.init    | 2 +-
 vm/app/catgirl/default.nix                       | 3 +--
 vm/app/catgirl/etc/s6-linux-init/scripts/rc.init | 2 +-
 vm/app/lynx/default.nix                          | 3 +--
 vm/app/lynx/etc/s6-linux-init/scripts/rc.init    | 2 +-
 vm/sys/net/default.nix                           | 4 ++--
 vm/sys/net/etc/s6-linux-init/scripts/rc.init     | 2 +-
 8 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index bb82374..f40e25d 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -5,7 +5,7 @@
 
 { lib, stdenv, runCommand, writeReferencesToFile, s6-rc, tar2ext4
 , busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod, mdevd, s6
-, s6-linux-init, s6-portable-utils, socat, util-linuxMinimal, xorg
+, s6-linux-init, socat, util-linuxMinimal, xorg
 }:
 
 let
@@ -20,8 +20,8 @@ let
   foot = pkgsGui.foot.override { allowPgo = false; };
 
   packages = [
-    cloud-hypervisor execline jq kmod mdevd s6 s6-linux-init s6-portable-utils
-    s6-rc socat start-vm
+    cloud-hypervisor execline jq kmod mdevd s6 s6-linux-init s6-rc socat
+    start-vm
 
     (cryptsetup.override {
       programs = {
diff --git a/host/rootfs/etc/s6-linux-init/scripts/rc.init b/host/rootfs/etc/s6-linux-init/scripts/rc.init
index 7b32d83..e205d8f 100755
--- a/host/rootfs/etc/s6-linux-init/scripts/rc.init
+++ b/host/rootfs/etc/s6-linux-init/scripts/rc.init
@@ -4,7 +4,7 @@
 
 if { s6-rc-init -c /etc/s6-rc /run/service }
 
-if { s6-mkdir -p /dev/pts /dev/shm }
+if { mkdir -p /dev/pts /dev/shm }
 if { mount -a }
 
 s6-rc change ok-all
diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix
index 55cccf0..4e700f8 100644
--- a/vm/app/catgirl/default.nix
+++ b/vm/app/catgirl/default.nix
@@ -10,14 +10,13 @@ pkgs.pkgsStatic.callPackage (
 { lib, stdenv, runCommand, writeReferencesToFile, buildPackages
 , s6-rc, tar2ext4
 , busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-linux-init
-, s6-portable-utils
 }:
 
 let
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep;
 
   packages = [
-    catgirl execline kmod mdevd s6 s6-linux-init s6-portable-utils s6-rc
+    catgirl execline kmod mdevd s6 s6-linux-init s6-rc
 
     (busybox.override {
       extraConfig = ''
diff --git a/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init b/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init
index 7b32d83..e205d8f 100755
--- a/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init
+++ b/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init
@@ -4,7 +4,7 @@
 
 if { s6-rc-init -c /etc/s6-rc /run/service }
 
-if { s6-mkdir -p /dev/pts /dev/shm }
+if { mkdir -p /dev/pts /dev/shm }
 if { mount -a }
 
 s6-rc change ok-all
diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix
index e74a96f..0d8a629 100644
--- a/vm/app/lynx/default.nix
+++ b/vm/app/lynx/default.nix
@@ -10,14 +10,13 @@ pkgs.pkgsStatic.callPackage (
 { lib, stdenv, runCommand, writeReferencesToFile, buildPackages
 , s6-rc, tar2ext4
 , busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-init
-, s6-portable-utils
 }:
 
 let
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep;
 
   packages = [
-    execline kmod lynx mdevd s6 s6-linux-init s6-portable-utils s6-rc
+    execline kmod lynx mdevd s6 s6-linux-init s6-rc
 
     (busybox.override {
       extraConfig = ''
diff --git a/vm/app/lynx/etc/s6-linux-init/scripts/rc.init b/vm/app/lynx/etc/s6-linux-init/scripts/rc.init
index 7b32d83..e205d8f 100755
--- a/vm/app/lynx/etc/s6-linux-init/scripts/rc.init
+++ b/vm/app/lynx/etc/s6-linux-init/scripts/rc.init
@@ -4,7 +4,7 @@
 
 if { s6-rc-init -c /etc/s6-rc /run/service }
 
-if { s6-mkdir -p /dev/pts /dev/shm }
+if { mkdir -p /dev/pts /dev/shm }
 if { mount -a }
 
 s6-rc change ok-all
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix
index 097ce0e..f145a2c 100644
--- a/vm/sys/net/default.nix
+++ b/vm/sys/net/default.nix
@@ -10,7 +10,7 @@ pkgs.pkgsStatic.callPackage (
 { lib, stdenv, runCommand, writeReferencesToFile, buildPackages
 , s6-rc, tar2ext4, xorg
 , busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6
-, s6-linux-init, s6-portable-utils
+, s6-linux-init
 }:
 
 let
@@ -19,7 +19,7 @@ let
   connman = connmanMinimal;
 
   packages = [
-    connman dbus execline kmod mdevd s6 s6-linux-init s6-portable-utils s6-rc
+    connman dbus execline kmod mdevd s6 s6-linux-init s6-rc
 
     (busybox.override {
       extraConfig = ''
diff --git a/vm/sys/net/etc/s6-linux-init/scripts/rc.init b/vm/sys/net/etc/s6-linux-init/scripts/rc.init
index 7b32d83..e205d8f 100755
--- a/vm/sys/net/etc/s6-linux-init/scripts/rc.init
+++ b/vm/sys/net/etc/s6-linux-init/scripts/rc.init
@@ -4,7 +4,7 @@
 
 if { s6-rc-init -c /etc/s6-rc /run/service }
 
-if { s6-mkdir -p /dev/pts /dev/shm }
+if { mkdir -p /dev/pts /dev/shm }
 if { mount -a }
 
 s6-rc change ok-all
-- 
cgit 1.4.1