···

       
178
       
178
       
 
       
        $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";

     

       
179
       
179
       
 
       
    } else {

     

       
180
       
180
       
 
       
        $conf .= "menuentry \"$name\" {\n";

     

       
181
       
181
       
-
       
<<<<<<< HEAD

     

       
182
       
182
       
-
       
        $conf .= $grubBoot->search . "\n";

     

       
183
       
183
       
-
       
        $conf .= $grubStore->search . "\n";

     

       
184
       
184
       
-
       
=======

     

       
185
       
185
       
-
       
>>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub

     

       
186
       
181
       
 
       
        $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;

     

       
187
       
182
       
 
       
        $conf .= "  multiboot $xen $xenParams\n" if $xen;

     

       
188
       
183
       
 
       
        $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";