William A. Kennington III
13ca3708b5
Fix #4236
2014-09-23 10:18:05 -07:00
Rickard Nilsson
5be23fe888
nixos/install-grub: Don't run GrubFs(/nix/store) if copyKernels is true
2014-09-23 14:34:44 +02:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
William A. Kennington III
4d193b7262
systemd: Support reload scripts
2014-09-15 20:04:49 -07:00
Eelco Dolstra
152ae27aac
Merge remote-tracking branch 'origin/systemd-216' into staging
2014-09-08 13:53:33 +02:00
Luca Bruno
dfa6f03ea3
Do not assert absolute path for nodev grub device. Closes #3996
2014-09-08 12:00:34 +02:00
Thomas Tuegel
53fa517176
Merge pull request #3961 from wkennington/master.grub
...
nixos/install-grub: Read correct mountpoints
2014-09-05 20:01:08 -05:00
Luca Bruno
718106e958
Fix initrd after recent busybox upgrades
2014-09-05 18:42:53 +02:00
William A. Kennington III
c6bd6d6d89
nixos/grub: Assert devices should be absolute paths
2014-09-04 10:31:39 -07:00
William A. Kennington III
f73f7ccc6e
nixos/install-grub: Read correct mountpoints
2014-09-04 10:31:39 -07:00
Michael Raskin
1a0d437bf3
Merge pull request #3944 from joshcartwright/gummiboot-timeout-fix
...
gummiboot/builder: fix timeout setting when unset
2014-09-04 20:17:44 +04:00
William A. Kennington III
eee8fd89b3
nixos/install-grub: Correct store path for search
2014-09-03 10:01:00 -07:00
Josh Cartwright
626a666da5
gummiboot/builder: fix timeout setting when unset
...
The gummiboot-builder.py script is expecting the @timeout@ metavar to be
substituted for either an empty string (in the case where a user has
left the timeout unset) or the actual value set in the system
configuration.
However, the config.boot.loader.gummiboot.timeout option defaults to
'null', and due to the way pkgs.substituteAll works, the substitution
for '@timeout@' is _never_ set to the empty string. This causes the
builder script to put a bogus line into /boot/loader/loader.conf:
timeout @timeout@
Fix this by explicitly setting 'timeout' to the empty string when it's
unset in the system configuration.
Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
2014-09-03 05:36:45 +02:00
William A. Kennington III
ccc758f414
nixos/install-grub: Fix typo
2014-09-02 18:56:53 -07:00
William A. Kennington III
961e9867b3
nixos/generate-config: Only add store search path when kernels are not copied
2014-09-02 09:16:13 -07:00
William A. Kennington III
9467937639
nixos/install-grub: Only check for /nix to be the mountPoint for the store
2014-09-02 09:16:13 -07:00
William A. Kennington III
61908bdd80
nixos/install-grub: Always copy kernels for different devices
2014-09-02 09:16:13 -07:00
William A. Kennington III
01ab1d57a3
nixos/install-grub: Detect nested btrfs subvolumes
2014-09-02 09:16:13 -07:00
William A. Kennington III
0b66483c9a
nixos/install-grub: Store path should be /nix/store not /nix
2014-09-02 09:16:13 -07:00
William A. Kennington III
36614ff3e2
Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
...
This reverts commit 94205f5f21
2014-09-02 09:16:13 -07:00
Eelco Dolstra
3d821c068a
Merge remote-tracking branch 'origin/master' into systemd-216
2014-09-02 14:43:27 +02:00
Michael Raskin
fa55a99701
Load EHCI befor OHCI and UHCI; from patch by Mathnerd314
2014-09-02 02:12:46 +04:00
Longrin Wischnewski
196c6260be
grub: fix grub merge error
2014-08-31 12:29:13 +02:00
Michael Raskin
94205f5f21
Revert "Merge pull request #2449 from wkennington/master.grub"
...
This reverts commit 469f22d7170078bc5d8f
2014-08-31 12:58:37 +04:00
Nicolas B. Pierron
a5d6219897
Merge pull request #3864 from nbp/useless-submodules
...
Remove useless use of undocumented submodules.
2014-08-30 18:21:17 +02:00
William A. Kennington III
7d16a429f0
nixos/install-grub: Fix Indentation
2014-08-29 12:19:13 -07:00
Nicolas Pierron
8c19690d99
Remove useless use of optionSet.
2014-08-29 18:43:03 +02:00
William A. Kennington III
cf7f7a5107
nixos/install-grub: Check /boot against /nix/store instead of /nix
2014-08-28 13:35:37 -07:00
William A. Kennington III
0f6079d999
nixos/grub: Fix spacing and correct subvolume detection
2014-08-28 13:35:36 -07:00
William A. Kennington III
4f096c044f
nixos/grub: Simplify detection of labels / uuids for provided device names
2014-08-28 13:35:36 -07:00
William A. Kennington III
c02bc3a9de
nixos/grub: Fix regex for getting subvolume name in btrfs
2014-08-28 13:35:36 -07:00
William A. Kennington III
3bf22679b3
nixos/grub: Kernels don't need to be copied if we can read the nix store
2014-08-28 13:35:36 -07:00
William A. Kennington III
87d5e457fe
nixos/grub: Grub detection is much simpler using subvol show
2014-08-28 13:35:36 -07:00
William A. Kennington III
d4a9645ef0
nixos/grub: Needs mount so add utillinux to bin
2014-08-28 13:35:35 -07:00
William A. Kennington III
8329d12b79
grub: Change fsIdentifier to str from string
2014-08-28 13:35:35 -07:00
William A. Kennington III
769d2dc6bf
nixos/grub: Catch errors from command execution
2014-08-28 13:35:35 -07:00
William A. Kennington III
d4e2040099
nixos/grub: Refactor install-grub.pl and correct perl syntax
2014-08-28 13:35:35 -07:00
William A. Kennington III
99b4792554
nixos/grub: Refactor perl script to remove the Switch module
2014-08-28 13:35:35 -07:00
William A. Kennington III
525acb4d4f
nixos/grub: Fix typo
2014-08-28 13:35:35 -07:00
William A. Kennington III
70c11772a6
nixos/grub: Fix some silly perl struct accesses
2014-08-28 13:35:35 -07:00
William A. Kennington III
a6e6c85f06
grub: Add support for detecting btrfs subvolumes
2014-08-28 13:35:35 -07:00
William A. Kennington III
fba9f641a8
grub: Add support for forcing devices to be identified with labels or UUIDs
2014-08-28 13:35:35 -07:00
William A. Kennington III
c5bdb469ce
Update the grub configuration script to handle more complex filesystem layouts including full zfs / and /boot
2014-08-28 13:35:35 -07:00
William A. Kennington III
02ab48d0ee
Enable grub zfsSupport if zfs is built into the initrd
2014-08-28 13:35:34 -07:00
William A. Kennington III
3c6e2fbba9
Add optional zfsSupport to the nixos grub configuration
2014-08-28 13:35:34 -07:00
William A. Kennington III
4f832b5217
Revert "grub: Allow setting the boot root explicitly"
...
This reverts commit e4630c1d41
2014-08-28 13:35:34 -07:00
Shea Levy
4061c18c98
Revert "grub: removed orphaned mkOption configurationName"
...
The configurationName option value is still used by NixOS, this removal
breaks grub users.
This reverts commit bd811d32b4
2014-08-27 03:26:40 -04:00
Eelco Dolstra
f6b4214567
/dev/sda1 -> "/dev/sda1"
...
Otherwise Nix might try to copy /dev/sda1 under certain circumstances
:-)
2014-08-26 19:30:45 +02:00
Joachim Schiele
bd811d32b4
grub: removed orphaned mkOption configurationName
2014-08-26 19:14:47 +02:00
aszlig
4a4c051a95
nixos: Remove modprobe.d/nixos.conf from initrd.
...
For example in VM tests, this causes firmware to be included in the
initrd. So until we have a better fix for adding early-stage module
options, I'll remove this.
Fixes a regression introduced by 0aa2c1dcloses #3764 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-24 18:19:56 +02:00
Eelco Dolstra
c23bf4ec74
systemd: Update to 216
2014-08-23 23:28:03 +02:00
Michael Raskin
0d95c5c647
Merge pull request #3553 from vcunat/p/keyboards
...
initrd.availableKernelModules: add support for keyboards
2014-08-23 12:49:04 +04:00
Michael Raskin
4a56121d8e
Merge pull request #3505 from Shados/fix-initrd-modprobe
...
initrd: Fixed to include/use modprobe config files
2014-08-23 12:46:28 +04:00
Eelco Dolstra
a7a08188bf
Containers: Don't remount /
2014-08-18 17:14:43 +02:00
Eelco Dolstra
7c4591d010
Don't barf if /var/log doesn't support ACLs
...
http://hydra.nixos.org/build/13462892
2014-08-18 14:21:45 +02:00
Vladimír Čunát
02cb604fd6
initrd.availableKernelModules: add support for keyboards
...
As explained in #2169 , some keyboards need special drivers,
so these are always added, both on installation and normal systems.
2014-08-12 20:00:01 +02:00
Alexei Robyn
0aa2c1dc46
initrd: Fixed to include/use modprobe config files
2014-08-09 22:14:52 +10:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Eelco Dolstra
0d3b3bd01b
systemd: Use the default log target ("journal-or-kmsg")
...
This ensures that early systemd messages end up in the journal (via
the kmsg buffer).
2014-08-06 14:15:12 +02:00
William A. Kennington III
beddd36c95
nixos/stage-1: Don't check resilient filesystems
2014-08-05 21:06:51 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
549855113b
modprobe.nix: Use modern environment.etc syntax
2014-07-31 22:09:51 +02:00
Emery Hemingway
63d259df32
nixos: tmp on tmpfs option
...
/tmp cleaning is done by systemd rather than stage-2-init
enableEmergencyMode moved from systemd to seperate module
new option to mount tmp on tmpfs
new option to enable additional units shipped with systemd
2014-07-30 16:19:26 +02:00
Eelco Dolstra
39a6750362
Shut up a warning in stage 2
2014-07-30 16:07:09 +02:00
Eelco Dolstra
e68b0c7f5f
Mount unionfs-fuse filesystems using the normal fileSystems option
2014-07-30 16:04:15 +02:00
Eelco Dolstra
d45dcf348e
Really fix NixOS/nixos#287
2014-07-30 16:04:15 +02:00
Eelco Dolstra
b7c543136a
Move CIFS support into a separate module
2014-07-30 12:39:35 +02:00
Eelco Dolstra
9956b97b2f
Check for systemd environment variables that are too long
...
Issue #3403 . For the case of $PATH being too long, we could call
buildEnv automatically.
2014-07-30 10:28:05 +02:00
Eelco Dolstra
cb7b871bd6
initrd: Include filesystem support for /nix, /var etc.
2014-07-28 22:31:18 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Eelco Dolstra
1a1442db74
Don't restart systemd-journal-flush
...
It only needs to be started during boot. Starting it at other times
shouldn't hurt, except that if systemd-journald is restarting at the
same time, the latter might not have a SIGUSR1 signal handler
installed yet, so it might be killed by systemd-journal-flush. (At
least that's my theory about the dead systemd-journald instances in
the build farm...)
2014-07-17 21:01:25 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Eelco Dolstra
3b2609deec
Don't restart systemd-remount-fs
...
It's only needed during early boot (in fact, it's probably not needed
at all on NixOS). Restarting it is expensive because it does a sync()
of the root file system.
2014-07-11 23:34:58 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
2014-06-30 14:56:10 +02:00
Paul Colomiets
11e25f1a3e
Implement per-user socket units
2014-06-20 17:41:14 -04:00
Evgeny Egorochkin
b415876bdb
systemd service: fix issues with escaping when unit name contains '-'
...
systemd escaping rules translate this into a string containing '\'
which is treated by some code paths as quoted, and by others as unquoted
causing the affected units to fail.
2014-06-11 04:08:13 +03:00
Eelco Dolstra
906aa9ccb1
Make pseudo-filesystems show up as "tmpfs" etc. rather than "none" in df
2014-06-05 13:39:17 +02:00
Shea Levy
57ed344917
Fix /run/keys permissions
2014-05-27 17:22:25 -04:00
Eelco Dolstra
c54eb79063
Don't kill unionfs-fuse during shutdown
...
Killing the daemon backing /nix/store prevents a clean shutdown. See
http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
2014-05-21 15:55:50 +02:00
Eelco Dolstra
5e364503d5
NixOS ISO: Don't use a unionfs for /
...
We don't need a unionfs on /, we only need a tmpfs.
2014-05-21 15:55:50 +02:00
Eelco Dolstra
bddd10d75c
switch-to-configuration: Don't restart instances of user@.service
...
Restarting user@ instances is bad because it causes all user services
(such as ssh-agent.service) to be restarted. Maybe one day we can have
switch-to-configuration restart user units in a fine-grained way, but
for now we should just ignore user systemd instances.
Backport: 14.04
2014-05-20 11:12:56 +02:00
Emery Hemingway
c96d5fe170
nixos: f2fs filesystem module support ( close #2085 )
2014-05-11 13:53:26 +02:00
Eelco Dolstra
5bfe944907
Don't run hwclock if /dev/rtc doesn't exist
...
E.g. on EC2 instances.
Backport: 14.04
2014-05-05 16:47:51 +02:00
Shea Levy
e4630c1d41
grub: Allow setting the boot root explicitly
...
If /boot is a btrfs subvolume, it will be on a different device than /
but not be at the root from grub's perspective. This should be fixed in
a nicer way by #2449 , but that can't go into 14.04.
2014-05-01 10:56:55 -04:00
Eelco Dolstra
728d3476ba
systemd: Require some more kernel features
2014-04-30 13:53:12 +02:00
Eelco Dolstra
9bb209a3bd
gummiboot: Automatically disable GRUB
2014-04-30 11:47:18 +02:00
Eelco Dolstra
d621300665
Revert "Don't mount /sys/fs/fuse/connections and /sys/kernel/config"
...
This reverts commit 6eaced3582
2014-04-28 09:19:01 +02:00
Eelco Dolstra
6eaced3582
Don't mount /sys/fs/fuse/connections and /sys/kernel/config
...
These fail to mount if you don't have the appropriate kernel support,
and this confuses NixOps' ‘check’ command. We should teach NixOps not
to complain about non-essential mount points, but in the meantime it's
better to turn them off.
2014-04-28 08:16:27 +02:00
Eelco Dolstra
da444ff26f
Turn assertion about oneshot services into a warning
2014-04-22 23:53:21 +02:00
Eelco Dolstra
fa3826dcf4
Ignore *.wants in systemd.packages for now
2014-04-22 17:38:53 +02:00
Shea Levy
1c5d3c7883
Merge branch 'modulesfix' of git://github.com/kirelagin/nixpkgs
...
ohci_pci is required in initrd since kernel 3.11
2014-04-21 07:51:31 -04:00
Kirill Elagin
ca7978a09d
ohci_pci is required in initrd since kernel 3.11
2014-04-21 15:42:05 +04:00
Eelco Dolstra
cf53152902
Fix GRUB 2 example
...
Fixes #1891 .
2014-04-20 19:41:15 +02:00
Eelco Dolstra
9f1c9404da
Put /var/setuid-wrappers on a tmpfs
...
This allows all other filesystems to be mounted without the suid
option.
2014-04-19 12:40:09 +02:00
Eelco Dolstra
2a64b0a91b
Shut up warning about resolv.conf missing
2014-04-19 12:34:59 +02:00
Mathijs Kwik
bf841cd892
Revert "systemd: oneshot units should be allowed to restart on failure/abort"
...
This reverts commit c1e638abb6
2014-04-18 21:42:22 +02:00
Eelco Dolstra
febb15f722
systemd: Enable keeping backlight / rfkill state across reboots
2014-04-18 19:37:15 +02:00
Eelco Dolstra
48d90cf3b6
Revert "Put /nix/var/nix/{temproots,userpool} on a tmpfs"
...
This reverts commit dd49094a25
2014-04-18 18:37:07 +02:00
Eelco Dolstra
1e540af43b
Fix broken upstream user unit symlinks
2014-04-18 17:38:06 +02:00
Eelco Dolstra
dd49094a25
Put /nix/var/nix/{temproots,userpool} on a tmpfs
2014-04-18 16:56:20 +02:00
