DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

set PATH for root user, mount /proc and /sys

Browse source
This commit is contained in:
Daniel Barlow 2022-09-22 00:10:00 +01:00
parent 45025f128a
commit edb701b87d
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
make-image.nix
View file

@ -37,17 +37,11 @@ let
s6-rc-compile $out/compiled $srcs s6-rc-compile $out/compiled $srcs
''; '';
}; };
rcS = writeScript "rcS" ''
#!${pkgs.pkgsStatic.busybox}/bin/sh
echo WHEEEE
PATH=${pkgs.pkgsStatic.busybox}/bin:$PATH
export PATH
mount -t devtmpfs none /dev/
mount -t devpts none /dev/pts
mount -t proc none /proc
mkdir -p /run/services
'';
s6-pseudofiles = pkgs.s6-init-files; s6-pseudofiles = pkgs.s6-init-files;
profile = writeScript ".profile" ''
PATH=${lib.makeBinPath (with pkgs; [busybox execline s6-linux-init s6-rc])}
export PATH
'';
pseudofiles = writeText "pseudofiles" '' pseudofiles = writeText "pseudofiles" ''
/ d 0755 0 0 / d 0755 0 0
/bin d 0755 0 0 /bin d 0755 0 0
@ -63,18 +57,19 @@ let
/dev/tty c 0777 root root 5 0 /dev/tty c 0777 root root 5 0
/dev/console c 0600 root root 5 1 /dev/console c 0600 root root 5 1
/proc d 0555 root root /proc d 0555 root root
/sys d 0555 root root
/dev/pts d 0755 0 0 /dev/pts d 0755 0 0
/etc/init.d d 0755 0 0 /etc/init.d d 0755 0 0
/bin/init s 0755 0 0 /etc/s6-linux-init/current/bin/init /bin/init s 0755 0 0 /etc/s6-linux-init/current/bin/init
/bin/sh s 0755 0 0 ${pkgs.pkgsStatic.busybox}/bin/sh /bin/sh s 0755 0 0 ${pkgs.pkgsStatic.busybox}/bin/sh
/bin/busybox s 0755 0 0 ${pkgs.busybox}/bin/busybox /bin/busybox s 0755 0 0 ${pkgs.busybox}/bin/busybox
/etc/init.d/rcS s 0755 0 0 ${rcS}
/etc/s6-rc d 0755 0 0 /etc/s6-rc d 0755 0 0
/etc/s6-rc/compiled s 0755 0 0 ${s6db}/compiled /etc/s6-rc/compiled s 0755 0 0 ${s6db}/compiled
/etc/passwd f 0644 0 0 echo "root::0:0:root:/:/bin/sh" /etc/passwd f 0644 0 0 echo "root::0:0:root:/:/bin/sh"
/.profile s 0644 0 0 ${profile}
''; '';
storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> { storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> {
storeContents = [ pseudofiles pkgs.strace s6-pseudofiles rcS pkgs.pkgsStatic.busybox s6db pkgs.s6-linux-init ] ++ config.packages ; storeContents = [ pseudofiles pkgs.strace s6-pseudofiles pkgs.pkgsStatic.busybox s6db pkgs.s6-linux-init ] ++ config.packages ;
# comp = "xz -Xdict-size 100%" # comp = "xz -Xdict-size 100%"
}; };
in runCommand "frob-squashfs" { in runCommand "frob-squashfs" {

3
pkgs/s6-init-files/scripts/rc.init
View file

@ -15,6 +15,9 @@ shift
### This is done only once at boot time. ### This is done only once at boot time.
### Ideally, this phase should just initialize the service manager. ### Ideally, this phase should just initialize the service manager.
mount -t proc none /proc
mount -t sysfs none /sys
### If your services are managed by s6-rc: ### If your services are managed by s6-rc:
### (replace /run/service with your scandir) ### (replace /run/service with your scandir)
s6-rc-init /run/service -d -c /etc/s6-rc/compiled s6-rc-init /run/service -d -c /etc/s6-rc/compiled