public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Only run grub-install in switch-to-configuration when

Browse Source 
NIXOS_INSTALL_GRUB is set (which we do in the installer).

svn path=/nixu/trunk/; revision=7146
This commit is contained in:
Eelco Dolstra 2006-11-27 13:51:08 +00:00
parent 3a70748bb5
commit 8c0b223c3c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/installer.sh
View File

@ -129,4 +129,4 @@ echo "$targetDevice / somefs rw 0 0" > $mountPoint/etc/mtab
# a menu default pointing at the kernel/initrd/etc of the new # a menu default pointing at the kernel/initrd/etc of the new
# configuration. # configuration.
echo "finalising the installation..." echo "finalising the installation..."
chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration NIXOS_INSTALL_GRUB=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration

2
test/system-configuration.sh
View File

@ -19,7 +19,9 @@ export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
if test -n "$grubDevice"; then if test -n "$grubDevice"; then
mkdir -m 0700 -p /boot/grub mkdir -m 0700 -p /boot/grub
$grubMenuBuilder $out $grubMenuBuilder $out
if test "\$NIXOS_INSTALL_GRUB" = 1; then
$grub/sbin/grub-install "$grubDevice" --no-floppy --recheck $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
fi
fi fi
EOF EOF