* Fix extraGrubEntriesBeforeNixos, it always placed the extra entries
before the default (so I suddenly found myself booting into Windows...). BTW it would be better to have string-valued options like extraGrubEntriesBefore / extraGrubEntriesAfter or something like that. svn path=/nixos/trunk/; revision=12401
This commit is contained in:
parent
088b09f401
commit
a66248e2a2
|
@ -114,20 +114,19 @@ if test -n "@copyKernels@"; then
|
|||
fi
|
||||
|
||||
# Additional entries specified verbatim by the configuration.
|
||||
extraGrubEntries=$(cat >> $tmp <<EOF
|
||||
extraGrubEntries=$(cat <<EOF
|
||||
@extraGrubEntries@
|
||||
EOF)
|
||||
EOF
|
||||
)
|
||||
|
||||
if test -n "@extraGrubEntriesBeforeNixos@"; then
|
||||
$extraGrubEntries
|
||||
echo "$extraGrubEntries" >> $tmp
|
||||
fi
|
||||
|
||||
if test -n "$tmp"; then
|
||||
addEntry "NixOS - Default" $default ""
|
||||
fi
|
||||
addEntry "NixOS - Default" $default ""
|
||||
|
||||
if test -n "@extraGrubEntriesBeforeNixos@"; then
|
||||
$extraGrubEntries
|
||||
if test -z "@extraGrubEntriesBeforeNixos@"; then
|
||||
echo "$extraGrubEntries" >> $tmp
|
||||
fi
|
||||
|
||||
# Add all generations of the system profile to the menu, in reverse
|
||||
|
|
Loading…
Reference in a new issue