diff options
| author | tv <tv@krebsco.de> | 2019-04-19 16:39:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2019-04-19 16:39:05 +0200 |
| commit | d825d2db8796a0d19f22eba240a2e49213cf01e2 (patch) | |
| tree | b7104f1b790ae0446fd44b1aad4c22f1c425af6d /makefu/1systems/sdev/config.nix | |
| parent | 5fbe320b9173b1ef0725a79548f34f967ad16130 (diff) | |
| parent | 6c719f03c1a5533b43957d3039b4aed5f5bd8b42 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/sdev/config.nix')
| -rw-r--r-- | makefu/1systems/sdev/config.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 2f289d500..66f822c02 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -6,13 +6,13 @@ [ # Include the results of the hardware scan. <stockholm/makefu> - <stockholm/makefu/2configs/hw/vbox-guest.nix> - #{ # until virtualbox-image is fixed - # imports = [ - # <stockholm/makefu/2configs/fs/single-partition-ext4.nix> - # ]; - # boot.loader.grub.device = lib.mkForce "/dev/sda"; - #} + # <stockholm/makefu/2configs/hw/vbox-guest.nix> # broken since 2019-04-18 + { # until virtualbox-image is fixed + imports = [ + <stockholm/makefu/2configs/fs/single-partition-ext4.nix> + ]; + boot.loader.grub.device = lib.mkForce "/dev/sda"; + } <stockholm/makefu/2configs/main-laptop.nix> # <secrets/extra-hosts.nix> |