[install-guide/f21-branch] More fixes in bootloader configs for PXE setup

[pbokoc]

commit 75dc677f80283e8dd88ed3941686f98d4d7974c5
Author: Petr Bokoc <pbokoc at redhat.com>
Date:   Wed Dec 10 20:00:54 2014 +0100

    More fixes in bootloader configs for PXE setup

 en-US/Network_based_Installations.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/en-US/Network_based_Installations.xml b/en-US/Network_based_Installations.xml
index d079c16..4c2dd79 100644
--- a/en-US/Network_based_Installations.xml
+++ b/en-US/Network_based_Installations.xml
@@ -219,19 +219,19 @@ label linux
   menu label ^Install Fedora &PRODVER; 64-bit
   menu default
   kernel f&PRODVER;/vmlinuz
-  append initrd=f&PRODVER;/initrd.img ip=dhcp inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/
+  append initrd=f&PRODVER;/initrd.img inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/ ip=dhcp
 
 label server
   menu label ^Install Fedora &PRODVER; Server
   menu default
   kernel f&PRODVER;/vmlinuz
-  append initrd=f&PRODVER;/initrd.img ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-server.ks?h=f21
+  append initrd=f&PRODVER;/initrd.img inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/ ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-server.ks?h=f21
 
 label rescue
   menu label ^Rescue installed system
   kernel f&PRODVER;/vmlinuz
-  append initrd=f&PRODVER;initrd.img rescue ip=dhcp root=live:http://dl.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/LiveOS/squashfs.img rescue
-
+  append initrd=f&PRODVER;initrd.img ip=dhcp root=live:http://dl.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/LiveOS/squashfs.img rescue
+  
 label local
   menu label Boot from ^local drive
   localboot 0xffff
@@ -255,18 +255,18 @@ set gfxpayload=keep
 insmod gzio
 
 menuentry 'Install &PRODUCT; 64-bit'  --class fedora --class gnu-linux --class gnu --class os {
-  linuxefi f&PRODVER;/vmlinuz ip=dhcp inst.repo=inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/
+  linuxefi f&PRODVER;/vmlinuz ip=dhcp inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/
   initrdefi f&PRODVER;/initrd.img
   }
                     
 menuentry 'Install Fedora &PRODVER; Server'  --class fedora --class gnu-linux --class gnu --class os {
   kernel f&PRODVER;/vmlinuz
-  append initrd=f&PRODVER;/initrd.img ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-server.ks?h=f21
+  append initrd=f&PRODVER;/initrd.img inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/ ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-server.ks?h=f21
   }
 
 menuentry 'Rescue installed system'  --class fedora --class gnu-linux --class gnu --class os {
   kernel f&PRODVER;/vmlinuz
-  append f&PRODVER;/initrd=initrd.img rescue root=live:http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/LiveOS/squashfs.img rescue
+  append f&PRODVER;/initrd=initrd.img root=live:http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Server/x86_64/os/LiveOS/squashfs.img rescue
   }
                 </programlisting>
               </step>