diff options
| author | lassulus <lass@blue.r> | 2018-09-18 15:47:03 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-18 15:47:03 +0200 |
| commit | 245994cc7ace5a323c476ccc50fd4026b9353dc4 (patch) | |
| tree | cf4a3d85c768bd1ca18913d17c67e07bcab95db7 /makefu/1systems/sdev | |
| parent | 1466d3e86abc4d85af6efe5a964df788cf0e36cc (diff) | |
| parent | 8a756c7333e0e7c4a0433d68775f8d7c1a53b8b0 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/sdev')
| -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 c2cd23d1e..2f289d500 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 = "/dev/sda"; - } + <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/main-laptop.nix> # <secrets/extra-hosts.nix> |