mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
* enableWLAN -> wireless.enable.
svn path=/nixos/trunk/; revision=32788
This commit is contained in:
parent
a7bd194d14
commit
974a74ad49
@ -242,8 +242,7 @@ if $generate; then
|
|||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
# hostName = "nixos"; # Define your hostname.
|
# hostName = "nixos"; # Define your hostname.
|
||||||
interfaceMonitor.enable = true; # Watch for plugged cable.
|
wireless.enable = true; # Enables Wireless.
|
||||||
enableWLAN = true; # Enables Wireless.
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Add file system entries for each partition that you want to see mounted
|
# Add file system entries for each partition that you want to see mounted
|
||||||
|
@ -155,7 +155,7 @@ in
|
|||||||
jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
|
jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
|
||||||
|
|
||||||
# Enable wpa_supplicant, but don't start it by default.
|
# Enable wpa_supplicant, but don't start it by default.
|
||||||
networking.enableWLAN = true;
|
networking.wireless.enable = true;
|
||||||
jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
|
jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -382,5 +382,5 @@ in
|
|||||||
services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
|
services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
|
||||||
|
|
||||||
# Wireless won't work in the VM.
|
# Wireless won't work in the VM.
|
||||||
networking.enableWLAN = mkOverride 50 false;
|
networking.wireless.enable = mkOverride 50 false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user