summary refs log tree commit diff
path: root/nixos/modules/system
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stagingVladimír Čunát2017-07-03
|\
| * luksroot: fix typoSilvan Mosberger2017-07-02
| |
* | nixos/boot/stage-1: fix failing nixos-rebuild switch because of blkid outputChristian Albrecht2017-06-26
|/ | | | | | | | | old version of blkid used to output version information including libblkid version when invoked with --help parameter new version does not output libblkid version when invoked with --help parameter fix is to invoke blkid with -V parameter to output version including libblkid in both cases
* systemd-boot-builder.py: add support for profiles (#26318)Kai2017-06-24
| | | | | | | | | | * systemd-boot-builder.py: add support for profiles This will also list the generations of other profiles than `system` in the boot menu. See the documentation of the `--profile-name` option of nixos-rebuild for more information on profiles. * Fix errors introduced by previous commit
* Merge pull request #26460 from romildo/fix.nixos-artworkJoachim F2017-06-13
|\ | | | | nixos-artwork: add more wallpapers
| * nixos-artwork: add more wallpapersromildo2017-06-07
| | | | | | | | | | | | | | | | | | Restructure the nixos-artwork to make it easy to selectively incorporate other components from upstream without needing to download the full package. Until now only the Gnome_Dark wallpaper was included. Add other wallpapers available in the package repository.
* | nixos/bcache: /bin/sh -> ${bash}/bin/shBjørn Forsman2017-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or else `services.udev.packages = [ bcache-tools ]` cannot be used. To not break bcache in the initrd I'm modifying this in stage-1.nix: - --replace /bin/sh ${extraUtils}/bin/sh + --replace ${bash}/bin/sh ${extraUtils}/bin/sh Reasoning behind that change: * If not modifying the /bin/sh pattern in any way, it will also match ${bash}/bin/sh, creating a broken path like /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file. * The addition of /bin/sh was done in 775f381a9e34 ("stage-1: add bcache support"). It seems somewhat plausible that no new users have appeared since then and we can take this opportunity to back out of this change without much fear of regressions. If there _are_ regressions, they should be in the form of build time errors, not runtime (boot), due to how the udev rule output is checked for invalid path references. So low risk, IMHO. * An alternative approach could be to copy the /bin/sh substitute rule over to the non-initrd udev rules implementation in NixOS, but I think this way is better: - The rules file comes with a working path out of the box. - We can use more precise pattern matching when modifying the udev rules for the initrd.
* | nixos: Add support for scalable fonts in Grub menus (#26227)Benjamin Staffin2017-06-10
|/ | | | | | The default font is unreadably small on some hidpi displays. This makes it possible to specify a TrueType or OpenType font at any point size, and it will automatically be converted to the format the Grub uses.
* systemd-nspawn: relax PrivateUsers checkJörg Thalheim2017-05-27
| | | | | this options allows two colon-separated number as value, for instances which is quite difficult to check.
* systemd-nspawn: fixes evaluation errorJörg Thalheim2017-05-27
| | | | fixes #25097
* services.logind: add options for lid-switch behaviorMaximilian Bosch2017-05-23
|
* systemd-nspawn: add NotifyRead fixupJörg Thalheim2017-05-20
|
* systemd-nspawn: add NotifyRead optionJörg Thalheim2017-05-20
|
* nixos/luks: Silence killall complain about non-existing cryptsetup processesRickard Nilsson2017-05-16
|
* systemd-boot: document reasoning behind syncfs(2)Jörg Thalheim2017-05-10
|
* systemd-boot: sync efi filesystem after updateJörg Thalheim2017-05-09
| | | | | | | Since fat32 provides little recovery facilities after a crash, it can leave the system in an unbootable state, when a crash/outage happens shortly after an update. To decrease the likelihood of this event sync the efi filesystem after each update.
* Merge pull request #25005 from Lassulus/copytoramJörg Thalheim2017-04-30
|\ | | | | nixos/stage1: add copytoram support
| * nixos/stage1: add copytoram supportlassulus2017-04-28
| |
* | nixos/grub: Add another example for extraEntriesaszlig2017-04-25
| | | | | | | | | | | | | | | | | | | | | | Someone on IRC wanted to boot Fedora from another disk. While I'm not too familiar with UEFI booting in conjunction with GRUB2 it took some time to get it to work. So in order to safe others from frustration I'm adding this as another example to the extraEntries option. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | nixos/systemd-boot-builder: Don't write .pyc filesaszlig2017-04-20
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has surfaced since d990aa716327abb018e8352dcf7ba2fcfb4fc34c. The "simpleUefiGummiboot" installer test fails since this commit, because that commit introduced a small check to verify whether the store was altered. While installing NixOS for the first time, the store is usually in /mnt/nix/store and without the read-only bind mount that's preventing programs from altering the store. So after nixos-install is done creating the system closure and setting it as the active system profile, the bootloader is written from the closure inside the chroot. The systemd-boot-builder is invoked during this step, which adds .pyc files for various Python modules of the Python 3 store path, which in turn invalidates the hash of the Python 3 store path itself. At the time the system is booted up again, the nix-store is verified and fails with something like this: path /nix/store/zvm545rqc4d97caqq9h7344bnd06jhzb-python3-3.5.3 was modified! expected hash b2c975f4b8d197443fbb09690fb3f6545e165dd44c9309d7d6df2fce0579ebeb, got bccca19f39c9d26d857ccf1fb72818b2b817967e6d497a25a1283e36ed0acf01 Running the interpreter with the -B argument prevents Python from writing those byte code files: https://docs.python.org/3/using/cmdline.html#cmdoption-B Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Revert "grub module: fix efiInstallAsRemovable description"Vladimír Čunát2017-04-18
| | | | | | | | | This reverts commit c2b56626f1a872d06642777193b72d6473c8b97c. It broke creating the manual. I suspect the descriptions are auto-wrapped by <para> and </para>. We've been through this already in 3af715af90. /cc #24978, @zraexy, @Mic92.
* grub module: fix efiInstallAsRemovable descriptionzraexy2017-04-17
|
* nixos: escape brackets in systemd unitsDomen Kožar2017-04-12
| | | | | | One day we should just whitelist instead of blacklist chars. Fixes https://github.com/NixOS/nixops/issues/614
* Merge pull request #24645 from Mic92/stage-2Jörg Thalheim2017-04-08
|\ | | | | Stage-2 cleanup
| * stage-2: shellsheck recommendationsJörg Thalheim2017-04-05
| |
| * stage-2: reduce mkdir commandsJörg Thalheim2017-04-05
| |
| * stage-2: process options as first actionJörg Thalheim2017-04-05
| | | | | | | | this way `set -x` is set early
| * stage-2: replace readonly-mountpoint by findmntJörg Thalheim2017-04-05
| |
| * stage-2: simplify exporting pathJörg Thalheim2017-04-05
| |
* | luksroot: Wait for the header (device) to appearMichael Weiss2017-04-05
|/ | | | | | | | | The LUKS header can be on another device (e.g. a USB stick). In my case it can take up to two seconds until the partition on my USB stick is available (i.e. the decryption fails without this patch). This will also remove some redundancy by providing the shell function `wait_target` and slightly improve the output (one "." per second and a success/failure indication after 10 seconds instead of always printing "ok").
* Allow systemd-fsck@.service to find fsck.*Eelco Dolstra2017-04-04
| | | | Fixes "fsck.ext4 doesn't exist, not checking file system on ...".
* Don't restart systemd-fsck@ unitsEelco Dolstra2017-04-04
| | | | | | | | Restarting them is useless since the filesystem is already checked. Worse, restarting them causes the filesystem to be unmounted. Also remove an override for systemd-rkill@.service which no longer exists.
* initrd-ssh: Use initrd secrets for host keysShea Levy2017-04-02
|
* systemd-boot: Support initrd secretsShea Levy2017-04-02
|
* Add facility to append secrets to the initrdShea Levy2017-04-02
|
* grub module: fix useOSProber when installing grub as EFISymphorien Gibol2017-03-23
|
* nixos/treewide: systemd.time is in manvolume 7Franz Pletz2017-03-21
| | | | cc #23396
* nixos/treewide: remove boolean examples for optionsFranz Pletz2017-03-17
| | | | | | | They contain no useful information and increase the length of the autogenerated options documentation. See discussion in #18816.
* ykpers: consolidate into yubikey-personalizationBenjamin Staffin2017-03-11
| | | | Looks like this accidentally got packaged twice.
* nixos-rebuild: Sync /nix/store onlyEelco Dolstra2017-03-03
| | | | | | | We only care about /nix/store because its contents might be out of sync with /nix/var/nix/db. Syncing other filesystems might cause unnecessary delays or hangs (e.g. I encountered a case where an NFS mount was taking a very long time to sync).
* dhcpcd service: fix network-online.target integrationFranz Pletz2017-02-23
| | | | | | | | | | When dhcpcd instead of networkd is used, the network-online.target behaved the same as network.target, resulting in broken services that need a working network connectivity when being started. This commit makes dhcpcd wait for a lease and makes it wanted by network-online.target. In turn, network-online.target is now wanted by multi-user.target, so it will be activated at every boot.
* systemd: Properly escape environment options.Kevin Cox2017-02-20
| | | | | | | | | | | Using toJSON on a string value works because the allowed JSON escape sequences is almost a subset of the systemd allowed escape sequences. The only exception is `\/` which JSON allows but systemd doesn't. Luckily this sequence isn't required and toJSON don't produce it making the result valid for systemd consumption. Examples of things that this fixes are environment variables with double quotes or newlines.
* Merge pull request #22941 from mayflower/systemd-tmpfilesRobin Gloster2017-02-20
|\ | | | | systemd: setup tmpfiles on switching configuration
| * systemd: setup tmpfiles on switching configurationRobin Gloster2017-02-18
| | | | | | | | | | This fixes systemd.tmpfiles.rules on switching configuration so that does not only get applied on a fresh boot. This e.g. fixes kubernetes.
* | systemd-boot: Unlink loader.conf if it existsaszlig2017-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since systemd version 232 the install subcommand of bootctl opens the loader.conf with fopen() modes "wxe", where the "e" stands for exclusive, so the call will fail if the file exists. For installing the boot loader just once this is fine, but if we're using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is already present this will fail. Exactly this is done within the simpleUefiGummiboot installer test, where nixos-install is called twice and thus the bootloader is also installed twice, resulting in an error during the fopen call: Failed to open loader.conf for writing: File exists Removing the file prior to calling bootctl should fix this. I've tested this using the installer.simpleUefiGummiboot test and it now succeeds. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra, @shlevy, @mic92 Fixes: #22925
* | systemd-boot: Make sure /etc/machine-id existsaszlig2017-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leads to the following error when trying to install a new machine where the machine ID wasn't yet initialized during boot: Failed to get machine did: No such file or directory In addition this was also detected by the simpleUefiGummiboot installer test. So let's generate a fallback machine ID by using systemd-machine-id-setup before actually running bootctl. Tested this by running the installer.simpleUefiGummiboot test, it still fails but not because of the machine ID. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra, @shlevy, @mic92 Fixes: #22561
* | Merge pull request #22969 from symphorien/extrainitrdFranz Pletz2017-02-20
|\ \ | |/ |/| grub module: add extraInitrd option
| * grub module: add extraInitrd optionSymphorien Gibol2017-02-19
| |
* | fix comments about nixos-hardware-scanBrice Waegeneire2017-02-18
| | | | | | | | It has been renamed to nixos-generate-config in 3ed4173
* | activation-script service: add utillinux to pathNikolay Amiantov2017-02-17
|/