forked from M-Labs/nix-servo
zynq: remove strace and add wget
This commit is contained in:
parent
c74391e94e
commit
8f664049d6
|
@ -62,7 +62,7 @@ index 6cc08e2..0c854c4 100644
|
|||
+
|
||||
exec runit
|
||||
diff --git a/stage-2.nix b/stage-2.nix
|
||||
index c61f9d6..46cf260 100644
|
||||
index c61f9d6..fbdf0fd 100644
|
||||
--- a/stage-2.nix
|
||||
+++ b/stage-2.nix
|
||||
@@ -20,6 +20,19 @@ with lib;
|
||||
|
@ -74,7 +74,7 @@ index c61f9d6..46cf260 100644
|
|||
+ example = "rm -f /var/log/messages";
|
||||
+ type = types.lines;
|
||||
+ 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
|
||||
index 3fa23ab..06dd1a5 100644
|
||||
index 3fa23ab..b95e7f8 100644
|
||||
--- a/zynq_image.nix
|
||||
+++ b/zynq_image.nix
|
||||
@@ -1,66 +1,90 @@
|
||||
|
@ -196,7 +196,7 @@ index 3fa23ab..06dd1a5 100644
|
|||
- environment.etc."service/getty/run".source = pkgs.writeShellScript "getty" ''
|
||||
- agetty ttyPS0 115200
|
||||
+ environment = {
|
||||
+ systemPackages = with pkgs; [ strace inetutils ];
|
||||
+ systemPackages = with pkgs; [ inetutils wget ];
|
||||
+ etc = {
|
||||
+ "service/getty/run".source = pkgs.writeShellScript "getty" ''
|
||||
+ hostname ${config.networking.hostName}
|
||||
|
|
Loading…
Reference in New Issue