Author: shlevy
Date: Sat Apr 2 01:26:21 2011
New Revision: 26667
URL: https://svn.nixos.org/websvn/nix/?rev=26667&sc=1
Log:
Moved the grub module to a more reasonable location
Added:
nixos/branches/efi-boot/modules/system/boot/grub/
nixos/branches/efi-boot/modules/system/boot/grub/grub-menu-builder.sh
- copied, changed from r26662,
nixos/branches/efi-boot/modules/installer/grub/grub-menu-builder.sh
nixos/branches/efi-boot/modules/system/boot/grub/grub.nix
- copied, changed from r26662,
nixos/branches/efi-boot/modules/installer/grub/grub.nix
nixos/branches/efi-boot/modules/system/boot/grub/winkler-gnu-blue-640x480.png
- copied, changed from r26662,
nixos/branches/efi-boot/modules/installer/grub/winkler-gnu-blue-640x480.png
nixos/branches/efi-boot/modules/system/boot/grub/winkler-gnu-blue.README
- copied, changed from r26662,
nixos/branches/efi-boot/modules/installer/grub/winkler-gnu-blue.README
Deleted:
nixos/branches/efi-boot/modules/installer/grub/grub-menu-builder.sh
nixos/branches/efi-boot/modules/installer/grub/grub.nix
nixos/branches/efi-boot/modules/installer/grub/winkler-gnu-blue-640x480.png
nixos/branches/efi-boot/modules/installer/grub/winkler-gnu-blue.README
Modified:
nixos/branches/efi-boot/modules/module-list.nix
Modified: nixos/branches/efi-boot/modules/module-list.nix
==============================================================================
--- nixos/branches/efi-boot/modules/module-list.nix Fri Apr 1 20:28:01
2011 (r26666)
+++ nixos/branches/efi-boot/modules/module-list.nix Sat Apr 2 01:26:21
2011 (r26667)
@@ -18,7 +18,6 @@
./hardware/network/rt73.nix
./hardware/pcmcia.nix
./installer/generations-dir/generations-dir.nix
- ./installer/grub/grub.nix
./installer/init-script/init-script.nix
./installer/tools/nixos-checkout.nix
./installer/tools/tools.nix
@@ -154,6 +153,7 @@
./services/x11/xserver.nix
./system/activation/activation-script.nix
./system/activation/top-level.nix
+ ./system/boot/grub/grub.nix
./system/boot/kernel.nix
./system/boot/luksroot.nix
./system/boot/modprobe.nix
Copied and modified:
nixos/branches/efi-boot/modules/system/boot/grub/grub-menu-builder.sh (from
r26662, nixos/branches/efi-boot/modules/installer/grub/grub-menu-builder.sh)
==============================================================================
Copied and modified: nixos/branches/efi-boot/modules/system/boot/grub/grub.nix
(from r26662, nixos/branches/efi-boot/modules/installer/grub/grub.nix)
==============================================================================
Copied and modified:
nixos/branches/efi-boot/modules/system/boot/grub/winkler-gnu-blue-640x480.png
(from r26662,
nixos/branches/efi-boot/modules/installer/grub/winkler-gnu-blue-640x480.png)
==============================================================================
Binary file (source and/or target). No diff available.
Copied and modified:
nixos/branches/efi-boot/modules/system/boot/grub/winkler-gnu-blue.README (from
r26662, nixos/branches/efi-boot/modules/installer/grub/winkler-gnu-blue.README)
==============================================================================
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
