move loopback config from base to netowrk module
This commit is contained in:
parent
b094220466
commit
7faf620c0b
2 changed files with 25 additions and 12 deletions
|
@ -80,18 +80,6 @@ in {
|
||||||
defaultProfile.packages = with pkgs;
|
defaultProfile.packages = with pkgs;
|
||||||
[ s6 s6-init-bin execline s6-linux-init s6-rc ];
|
[ s6 s6-init-bin execline s6-linux-init s6-rc ];
|
||||||
|
|
||||||
hardware.networkInterfaces = {
|
|
||||||
lo =
|
|
||||||
let iface = interface { type = "loopback"; device = "lo";};
|
|
||||||
in bundle {
|
|
||||||
name = "loopback";
|
|
||||||
contents = [
|
|
||||||
(address iface { family = "inet4"; address ="127.0.0.1"; prefixLength = 8;})
|
|
||||||
(address iface { family = "inet6"; address ="::1"; prefixLength = 128;})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.commandLine = [
|
boot.commandLine = [
|
||||||
"console=ttyS0,115200 panic=10 oops=panic init=/bin/init loglevel=8"
|
"console=ttyS0,115200 panic=10 oops=panic init=/bin/init loglevel=8"
|
||||||
"root=${config.hardware.rootDevice}"
|
"root=${config.hardware.rootDevice}"
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
let
|
let
|
||||||
inherit (lib) mkOption types;
|
inherit (lib) mkOption types;
|
||||||
inherit (pkgs) liminix;
|
inherit (pkgs) liminix;
|
||||||
|
inherit (pkgs.liminix.services) bundle;
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
system.service.network = {
|
system.service.network = {
|
||||||
|
@ -31,6 +32,30 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
|
hardware.networkInterfaces = {
|
||||||
|
lo =
|
||||||
|
let
|
||||||
|
net = config.system.service.network;
|
||||||
|
iface = net.link.build { ifname = "lo";};
|
||||||
|
in bundle {
|
||||||
|
name = "loopback";
|
||||||
|
contents = [
|
||||||
|
( net.address.build {
|
||||||
|
interface = iface;
|
||||||
|
family = "inet";
|
||||||
|
address ="127.0.0.1";
|
||||||
|
prefixLength = 8;
|
||||||
|
})
|
||||||
|
( net.address.build {
|
||||||
|
interface = iface;
|
||||||
|
family = "inet6";
|
||||||
|
address = "::1";
|
||||||
|
prefixLength = 128;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
system.service.network = {
|
system.service.network = {
|
||||||
link = liminix.callService ./link.nix {
|
link = liminix.callService ./link.nix {
|
||||||
ifname = mkOption {
|
ifname = mkOption {
|
||||||
|
|
Loading…
Reference in a new issue