فهرست منبع

Splits out nameserver to its own kernel option

Moves nameserver out of ip option to nameserver
option on anaconda style installers, also removes
unused netcfg options
Antony Messerli 5 سال پیش
والد
کامیت
4180f4a1e5
8فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 1 1
      src/centos.ipxe
  2. 1 1
      src/debian.ipxe
  3. 1 1
      src/devuan.ipxe
  4. 1 1
      src/fedora.ipxe
  5. 1 1
      src/opensuse.ipxe
  6. 1 1
      src/rhel.ipxe
  7. 2 2
      src/scientific.ipxe
  8. 1 1
      src/ubuntu.ipxe

+ 1 - 1
src/centos.ipxe

@@ -3,7 +3,7 @@
 # CentOS Operating System
 # http://www.centos.org
 
-isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none:${dns}
+isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
 set ipparam BOOTIF=${netX/mac} ${ipparam}
 
 goto ${menu} ||

+ 1 - 1
src/debian.ipxe

@@ -75,7 +75,7 @@ goto deb_boot
 :deb_boot
 imgfree
 echo Boot parameters: ${install_params} -- quiet ${params}
-kernel http://${debian_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
+kernel http://${debian_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
 initrd http://${debian_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:

+ 1 - 1
src/devuan.ipxe

@@ -61,7 +61,7 @@ goto devuan_boot
 :devuan_boot
 imgfree
 echo Boot parameters: ${install_params} -- quiet ${params}
-kernel http://${devuan_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
+kernel http://${devuan_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
 initrd http://${devuan_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:

+ 1 - 1
src/fedora.ipxe

@@ -3,7 +3,7 @@
 # Fedora Operating System
 # https://getfedora.org/
 
-isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none:${dns}
+isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
 set ipparam BOOTIF=${netX/mac} ${ipparam}
 
 goto ${menu} ||

+ 1 - 1
src/opensuse.ipxe

@@ -69,7 +69,7 @@ iseq ${version} tumbleweed && set dir ${version}/repo/oss ||
 imgfree
 kernel http://${opensuse_mirror}/${dir}/boot/x86_64/loader/linux
 initrd http://${opensuse_mirror}/${dir}/boot/x86_64/loader/initrd
-imgargs linux ${netsetup} install=http://${opensuse_mirror}/${dir} ${params} ${netcfg} ${console} initrd=initrd
+imgargs linux ${netsetup} install=http://${opensuse_mirror}/${dir} ${params} ${console} initrd=initrd
 echo
 echo MD5sums:
 md5sum linux initrd

+ 1 - 1
src/rhel.ipxe

@@ -3,7 +3,7 @@
 # Redhat Enterprise Linux (RHEL)
 # https://www.redhat.com
 
-isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none:${dns}
+isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
 set ipparam BOOTIF=${netX/mac} ${ipparam}
 
 set rhel_arch x86_64

+ 2 - 2
src/scientific.ipxe

@@ -3,7 +3,7 @@
 # Scientific Linux Operating System
 # https://www.scientificlinux.org/
 
-isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none:${dns}
+isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
 set ipparam BOOTIF=${netX/mac} ${ipparam}
 
 goto ${menu} ||
@@ -50,7 +50,7 @@ goto bootos_images
 
 :bootos_images
 imgfree
-kernel http://ftp1.scientificlinux.org/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${netcfg} ${console} ${ipparam}
+kernel http://ftp1.scientificlinux.org/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${console} ${ipparam}
 initrd http://ftp1.scientificlinux.org/${dir}/images/pxeboot/initrd.img
 boot
 goto linux_menu

+ 1 - 1
src/ubuntu.ipxe

@@ -61,7 +61,7 @@ goto deb_boot
 :deb_boot
 set dir ${dir}${menu}-installer/${arch_a}
 imgfree
-kernel http://${ubuntu_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
+kernel http://${ubuntu_mirror}/${dir}/linux ${install_params} ${mirrorcfg} ${console} -- quiet ${params} initrd=initrd.gz
 initrd http://${ubuntu_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums: