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

* Synced with trunk @ 15192

Browse Source 
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
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
installer/grub-menu-builder.sh
View File

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