forked from M-Labs/nix-servo
transfer definition of nameserver to avoid patch hunk error
This commit is contained in:
parent
38638fa5fe
commit
0de5ddeb1e
|
@ -1,21 +1,14 @@
|
|||
diff --git a/base.nix b/base.nix
|
||||
index 7eaee32..be5a47c 100644
|
||||
--- a/base.nix
|
||||
+++ b/base.nix
|
||||
@@ -95,7 +95,7 @@ with lib;
|
||||
'';
|
||||
bashrc.text = "export PATH=/run/current-system/sw/bin";
|
||||
profile.text = "export PATH=/run/current-system/sw/bin";
|
||||
- "resolv.conf".text = "nameserver 10.0.2.3";
|
||||
+ "resolv.conf".text = "nameserver 192.168.1.1";
|
||||
passwd.text = ''
|
||||
root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash
|
||||
sshd:x:498:65534:SSH privilege separation user:/var/empty:/run/current-system/sw/bin/nologin
|
||||
diff --git a/configuration.nix b/configuration.nix
|
||||
index 010c487..37f6aaa 100644
|
||||
index 010c487..e1e85ba 100644
|
||||
--- a/configuration.nix
|
||||
+++ b/configuration.nix
|
||||
@@ -7,8 +7,10 @@
|
||||
@@ -1,4 +1,4 @@
|
||||
-{ pkgs, ... }:
|
||||
+{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./qemu.nix ];
|
||||
@@ -7,10 +7,15 @@
|
||||
environment.etc = {
|
||||
"ssh/authorized_keys.d/root" = {
|
||||
text = ''
|
||||
|
@ -28,6 +21,11 @@ index 010c487..37f6aaa 100644
|
|||
'';
|
||||
mode = "0444";
|
||||
};
|
||||
+ "resolv.conf".text = lib.mkForce ''
|
||||
+ nameserver 192.168.1.1
|
||||
+ '';
|
||||
};
|
||||
}
|
||||
diff --git a/runit.nix b/runit.nix
|
||||
index d7b0bf3..67cff43 100644
|
||||
--- a/runit.nix
|
||||
|
|
Loading…
Reference in New Issue