* Synced with trunk @ 15192

svn path=/nixos/branches/modular-nixos/; revision=15360
This commit is contained in:
Marc Weber 2009-04-28 13:30:31 +00:00
parent c1bae06376
commit e96fada917

View File

@ -37,9 +37,9 @@ fi
configurationCounter=0
configurationLimit="@configurationLimit@"
numAlienEntries=$(cat <<EOF | egrep '^[[:space:]]*title' | wc -l
numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
@extraGrubEntries@
EOF)
EOF`
if test $((configurationLimit+numAlienEntries)) -gt 190; then
configurationLimit=$((190-numAlienEntries));
@ -114,10 +114,10 @@ if test -n "@copyKernels@"; then
fi
# Additional entries specified verbatim by the configuration.
extraGrubEntries=$(cat <<EOF
extraGrubEntries=`cat <<EOF
@extraGrubEntries@
EOF
)
EOF`
if test -n "@extraGrubEntriesBeforeNixos@"; then
echo "$extraGrubEntries" >> $tmp