summary refs log tree commit diff
path: root/nixos/modules/system
Commit message (Collapse)AuthorAge
* nixos/activation-script: fix formatting of exampleLeroy Hopson2016-02-27
|
* Merge pull request #10546 from aszlig/nixops-issue-350zimbatm2016-02-26
|\ | | | | Fixes for NixOps issue #350
| * switch-to-configuration: Fix unit name quoting.aszlig2015-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearly it would be the best if we'd directly generate mount units instead of converting /etc/fstab. But in order to do that we need to test it throughly so this approach is for the next stable release. This fix however is intended for inclusion into release-14.12 and release-15.09. Using a simple regular expression unfortunately isn't sufficient for proper mount unit name quoting/escaping and there is a utility in systemd called systemd-escape which does nothing less than that. Of course, using an external program to escape the unit name is way more expensive and causes us to fork for each mount point. But given that we already do quite a lot of forks just for unit starting and stopping, I think it doesn't matter that much. Well, except if you have a whole bunch of mount points. However, if the latter is the case and you have thousands of mount points, you probably have stumbled over this already if your mount point contains a dash. As for my motivation to fix this: I've stumbled on this while trying to fix the "none" backend test for NixOps (see NixOS/nixops#350), where the target machines use /nix/.ro-store and /nix/.rw-store as mount points. The implementation we had so far did improperly escape it so those mount points got the following unit files: * nix-.ro-store.mount * nix-.rw-store.mount The correct names for these units are however: * nix-.ro\x2dstore.mount * nix-.rw\x2dstore.mount So using systemd-escape now properly generates these names. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | nixos/stage-1/2: Added -r option to read so that read interprets backslashes ↵Roger Qiu2016-02-24
| | | | | | | | literally, and corrected the comment about optional logging.
* | Make stage-1/2 logging unconditional, and drop log level to "debug"Eelco Dolstra2016-02-23
| | | | | | | | | | Using "debug" level prevents spamming the console with messages twice (once directly and once via kmsg).
* | nixos/stage-2: Added boot.logCommandsRoger Qiu2016-02-23
| |
* | nixos/stage-1: Added boot.initrd.logCommandsRoger Qiu2016-02-23
| |
* | Revert "Remove double-backslashes from grub conf file".Peter Simons2016-02-12
| | | | | | | | | | | | | | This reverts commit b861bf8ddff67703, because according to @mdorman [1] this change rendered his NixOS systems unbootable, and we probably don't want that. [1] https://github.com/NixOS/nixpkgs/commit/b861bf8ddff677031e93a8e1c55311be63e0eb63#commitcomment-16058598
* | Remove double-backslashes from grub conf fileBen Booth2016-02-11
| | | | | | The double-backspashes in the splashimage, kernel, and initrd sections serve no purpose and confuse pygrub
* | init-script-builder: handle containers without a kernelNikolay Amiantov2016-02-10
| |
* | Merge pull request #10417 from puffnfresh/nixos/mmc_blockRobin Gloster2016-02-08
|\ \ | | | | | | initrd: add mmc_block to default available modules
| * | initrd: add mmc_block to default available modulesBrian McKenna2015-10-16
| |/ | | | | | | | | | | | | mmc_block and sdhci_acpi are both necessary for a Bay Trail Chromebook with an internal eMMC drive. The sdhci_acpi module is detectable but I can not figure out a way to check whether the mmc_block module is needed by just looking at /sys/
* | filesystems: use list of strings for fs optionsAneesh Agrawal2016-02-06
| | | | | | | | | | | | | | | | | | | | | | | | Allow usage of list of strings instead of a comma-separated string for filesystem options. Deprecate the comma-separated string style with a warning message; convert this to a hard error after 16.09. 15.09 was just released, so this provides a deprecation period during the 16.03 release. closes #10518 Signed-off-by: Robin Gloster <mail@glob.in>
* | switch-to-configuration: Handle failure to read /proc/1/exeEelco Dolstra2016-02-03
| | | | | | | | | | | | | | | | | | | | It's not entirely clear why this happens, but sometimes /proc/1/exe returns a bogus value, like /ar3a3j6b9livhy5fcfv69izslhgk4gcz-systemd-217/lib/systemd/systemd. In any case, we can just conservatively assume that we need to restart systemd when this happens. Fixes #10261.
* | initrd-ssh module: don't check if network is upNikolay Amiantov2016-02-03
| | | | | | | | We already do this in initrd-network.
* | initrd-network: call postCommands only if network is upNikolay Amiantov2016-02-03
| |
* | nixos/stage-1: Fix references to readlink/basenameaszlig2016-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes references coming from the mdadm udev rules. This addresses #12722 (mdadm udev rules have references to /usr/bin) but still won't fix the warning, though (if we want to fix the warnings, we will have to patch the udev rules generater in services/hardware/udev). For common mdraid functionality, this shouldn't fix anything, because the wrong references seem to only apply to containers, see these (wrapped) lines from ${mdadm}/lib/udev/rules.d/63-md-raid-arrays.rules: # Tell systemd to run mdmon for our container, if we need it. ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | initrd modules: move passwd and nsswitch back to initrd-sshNikolay Amiantov2016-02-03
| | | | | | | | | | | | | | Partially reverts commit 901163c0c707d36323400394bf6e75adc4621e2f. This has broken remote SSH into initrd because ${cfg.shell} is not expanded. Also, nsswitch is useless without libnss_files.so which are installed by initrd-ssh.
* | initrd-ssh module: enable only if initrd network is enabledNikolay Amiantov2016-02-03
| |
* | initrd-network module: initialize network before other pre-LVM commandsNikolay Amiantov2016-02-03
| | | | | | | | | | This is needed to ensure that network will be initialized before LUKS passphrase is asked.
* | boot.initrd.network: Support DHCPEelco Dolstra2016-02-02
| | | | | | | | This allows us to use it for EC2 instances.
* | Split the initrd sshd support into a separate moduleEelco Dolstra2016-02-02
| | | | | | | | | | Also, drop boot.initrd.postEarlyDeviceCommands since preLVMCommands should work fine.
* | initrd: Use modprobe from busyboxEelco Dolstra2016-02-01
| |
* | Merge pull request #12481 from nathan7/usrbinenv-optionPeter Simons2016-01-22
|\ \ | | | | | | activation-script module: add environment.usrbinenv option
| * | activation-script module: add environment.usrbinenv optionNathan Zadoks2016-01-19
| | |
* | | Merge pull request #11896 from mayflower/upstream-networkdRobin Gloster2016-01-20
|\ \ \ | |/ / |/| | networkd: add IPForward IPMasquerade options, DHCPServer section
| * | networkd: add DHCPServer config sectionChristian Albrecht2015-12-23
| | |
| * | networkd: add IPForward and IPMasquerade optionsChristian Albrecht2015-12-23
| | | | | | | | | | | | to Network config section
* | | systemd service: add *.busname upstream unitsNikolay Amiantov2016-01-18
| | |
* | | types: remove references to new packageSetRobin Gloster2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts part of a04a7272aa38ada45e694281071b720d4abbd0df packageSet is slated to be introduced in #11866 but currently causes evalation errors. /cc @ts468
* | | Add missing 'type', 'defaultText' and 'literalExample' in module definitionsThomas Strobel2016-01-17
| | | | | | | | | | | | | | | | | | - add missing types in module definitions - add missing 'defaultText' in module definitions - wrap example with 'literalExample' where necessary in module definitions
* | | systemd: backslashes are no longer allowed in script namesEvgeny Egorochkin2016-01-10
| | |
* | | Merge pull request #10996 from oxij/nixos-labelArseniy Seroka2016-01-09
|\ \ \ | | | | | | | | nixos: introduce system.nixosLabel support
| * | | nixos: introduce system.nixosLabel option and use it where appropriateJan Malakhovski2016-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting nixosVersion to something custom is useful for meaningful GRUB menus and /nix/store paths, but actuallly changing it rebulids the whole system path (because of `nixos-version` script and manual pages). Also, changing it is not a particularly good idea because you can then be differentitated from other NixOS users by a lot of programs that read /etc/os-release. This patch introduces an alternative option that does all you want from nixosVersion, but rebuilds only the very top system level and /etc while using your label in the names of system /nix/store paths, GRUB and other boot loaders' menus, getty greetings and so on.
* | | | Merge pull request #12198 from mayflower/remove-upstart-layerDaniel Peebles2016-01-07
|\ \ \ \ | | | | | | | | | | Remove upstart layer
| * | | | jobs -> systemd.servicesRobin Gloster2016-01-07
| | | | |
* | | | | linux: Make Unix domain sockets builtinEelco Dolstra2016-01-07
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hopefully fixes intermittent initrd failures where udevd cannot create a Unix domain socket: machine# running udev... machine# error getting socket: Address family not supported by protocol machine# error initializing udev control socket machine# error getting socket: Address family not supported by protocol The "unix" kernel module is supposed to be loaded automatically, and clearly that works most of the time, but maybe there is a race somewhere. In any case, no sane person would run a kernel without Unix domain sockets, so we may as well make it builtin. http://hydra.nixos.org/build/30001448
* | | | NixOS tests: Increase hung_task_timeout_secsEelco Dolstra2016-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hopefully fixes intermittent test failures like http://hydra.nixos.org/build/29962437 router# [ 240.128835] INFO: task mke2fs:99 blocked for more than 120 seconds. router# [ 240.130135] Not tainted 3.18.25 #1-NixOS router# [ 240.131110] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. assuming that these are caused by high load on the host.
* | | | kernel: do not load `configs` module (close #10912)Vladimír Čunát2016-01-04
| | | | | | | | | | | | | | | | | | | | | | | | ... because we make it built-in by default. I can't imagine anyone who wanted to purge this module from his/her system, so let's keep it simple, at least for now.
* | | | btrfsProgs -> canonical btrfs-progsTobias Geerinckx-Rice2016-01-03
| | | |
* | | | etc: Use a friendlier name than "etc-file"Eelco Dolstra2015-12-30
| | | |
* | | | install-grub: Make more robust against GC'ed system profile entriesEelco Dolstra2015-12-30
| |/ / |/| | | | | | | | | | | | | | | | | | | | Previously this barfed with: updating GRUB 2 menu... fileparse(): need a valid pathname at /nix/store/zldbbngl0f8g5iv4rslygxwp0dbg1624-install-grub.pl line 391. warning: error(s) occured while switching to the new configuration
* | | nixos trustedGRUB: add support for HP laptopsThomas Strobel2015-12-22
| | |
* | | grub: fix typo in variable name (trivial)Nicole Angel2015-12-10
| | |
* | | systemd: enable timedated, hostnamed, localed.Gabriel Ebner2015-12-07
| | |
* | | systemd module: Add OnFailure to systemd common unit optionsJaka Hudoklin2015-11-16
| | |
* | | Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III2015-11-13
|\ \ \ | |/ / |/| | | | | This is a partial merge of staging for builds which are working
| * | Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-10-30
| |\ \
| * | | systemd: Update to 227Eelco Dolstra2015-10-07
| | | |
| * | | Merge remote-tracking branch 'origin/master' into systemd-219Eelco Dolstra2015-10-01
| |\ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-02 01:00:08 +0000