M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zynq: remove strace and add wget

This commit is contained in:
Florian Agbuya 2024-01-16 13:20:18 +08:00
parent c74391e94e
commit 8f664049d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pr-28.patch
View File

@ -62,7 +62,7 @@ index 6cc08e2..0c854c4 100644
+ +
exec runit exec runit
diff --git a/stage-2.nix b/stage-2.nix diff --git a/stage-2.nix b/stage-2.nix
index c61f9d6..46cf260 100644 index c61f9d6..fbdf0fd 100644
--- a/stage-2.nix --- a/stage-2.nix
+++ b/stage-2.nix +++ b/stage-2.nix
@@ -20,6 +20,19 @@ with lib; @@ -20,6 +20,19 @@ with lib;
@ -74,7 +74,7 @@ index c61f9d6..46cf260 100644
+ example = "rm -f /var/log/messages"; + example = "rm -f /var/log/messages";
+ type = types.lines; + type = types.lines;
+ description = lib.mdDoc '' + description = lib.mdDoc ''
+ Shell commands to be executed just before runnit is started. + Shell commands to be executed just before runit is started.
+ ''; + '';
+ }; + };
+ }; + };
@ -96,7 +96,7 @@ index c61f9d6..46cf260 100644
}; };
} }
diff --git a/zynq_image.nix b/zynq_image.nix diff --git a/zynq_image.nix b/zynq_image.nix
index 3fa23ab..06dd1a5 100644 index 3fa23ab..b95e7f8 100644
--- a/zynq_image.nix --- a/zynq_image.nix
+++ b/zynq_image.nix +++ b/zynq_image.nix
@@ -1,66 +1,90 @@ @@ -1,66 +1,90 @@
@ -196,7 +196,7 @@ index 3fa23ab..06dd1a5 100644
- environment.etc."service/getty/run".source = pkgs.writeShellScript "getty" '' - environment.etc."service/getty/run".source = pkgs.writeShellScript "getty" ''
- agetty ttyPS0 115200 - agetty ttyPS0 115200
+ environment = { + environment = {
+ systemPackages = with pkgs; [ strace inetutils ]; + systemPackages = with pkgs; [ inetutils wget ];
+ etc = { + etc = {
+ "service/getty/run".source = pkgs.writeShellScript "getty" '' + "service/getty/run".source = pkgs.writeShellScript "getty" ''
+ hostname ${config.networking.hostName} + hostname ${config.networking.hostName}