Преглед изворни кода

add ip params to arch variants (#546)

* add ip params to arch variants

* bug bashing while testing

* bad name for parrot live
Ryan Kuba пре 5 година
родитељ
комит
995b913975

+ 2 - 1
roles/netbootxyz/templates/menu/anarchy.ipxe.j2

@@ -7,6 +7,7 @@ goto ${menu}
 
 :anarchy
 set os {{ releases.anarchy.name }}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 menu ${os} Installers
 {% for item in releases.anarchy.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -17,7 +18,7 @@ goto anarchy_boot
 :anarchy_boot
 imgfree
 set url ${live_endpoint}{{ endpoints.anarchy.path }}
-kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} initrd=initrd
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} initrd=initrd
 initrd ${url}initrd
 boot
 goto anarchy_exit

+ 2 - 1
roles/netbootxyz/templates/menu/blackarch.ipxe.j2

@@ -7,6 +7,7 @@ goto ${menu}
 
 :blackarch
 set os {{ releases.blackarch.name }}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 menu ${os} Installers
 item --gap The Default login is root/blackarch
 item --gap Run blackarch-install once logged in
@@ -19,7 +20,7 @@ goto blackarch_boot
 :blackarch_boot
 imgfree
 set url ${live_endpoint}{{ endpoints['blackarch-installer'].path }}
-kernel ${url}vmlinuz archisobasedir=blackarch ip=dhcp archiso_http_srv=${url} initrd=initrd
+kernel ${url}vmlinuz archisobasedir=blackarch ${ipparam} archiso_http_srv=${url} initrd=initrd
 initrd ${url}initrd
 boot
 goto blackarch_exit

+ 2 - 1
roles/netbootxyz/templates/menu/live-bluestar.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 set os Bluestar
 menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "bluestar" %}
@@ -27,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} cow_spacesize=30% cow_label=BSLX_PERSIST ipv6.disable=1 disablehooks=v86d,915resolution,gma3600 modprobe.blacklist=uvesafb console=tty1 initrd=initrd
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} cow_spacesize=30% cow_label=BSLX_PERSIST ipv6.disable=1 disablehooks=v86d,915resolution,gma3600 modprobe.blacklist=uvesafb console=tty1 initrd=initrd
 initrd ${url}initrd
 boot
 

+ 2 - 1
roles/netbootxyz/templates/menu/live-manjaro.ipxe.j2

@@ -7,6 +7,7 @@ menu Manjaro Live - Current Arch [ ${arch} ]
 item --gap Currently during boot you need to press ctrl+d/ctrl+c
 item --gap repeatedly when init hangs on starting a download
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap Manjaro Live
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "manjaro" and 'squash' in key %}
@@ -26,7 +27,7 @@ imgfree
 set fetch_url ${live_endpoint}{{ value.path }}
 {% for key, value in endpoints.items() | sort %}
 {% if key == kernel_name %}
-kernel ${live_endpoint}{{ value.path }}vmlinuz misobasedir=manjaro ip=dhcp miso_http_srv=${fetch_url} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 driver=free tz=UTC lang=en_US keytable=us systemdshow_status=1 apparmor=1 security=apparmor
+kernel ${live_endpoint}{{ value.path }}vmlinuz misobasedir=manjaro ${ipparam} miso_http_srv=${fetch_url} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 driver=free tz=UTC lang=en_US keytable=us systemdshow_status=1 apparmor=1 security=apparmor
 initrd ${live_endpoint}{{ value.path }}initrd
 boot
 {% endif %}

+ 0 - 0
roles/netbootxyz/templates/menu/live-parrot-ipxe.j2 → roles/netbootxyz/templates/menu/live-parrot.ipxe.j2


+ 2 - 1
roles/netbootxyz/templates/menu/live-velt.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 set os Velt
 menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "velt" %}
@@ -27,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} initrd=initrd
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} initrd=initrd
 initrd ${url}initrd
 boot
 

+ 2 - 1
roles/netbootxyz/templates/menu/systemrescue.ipxe.j2

@@ -8,6 +8,7 @@ menu ${os} - Current Arch [ ${arch} ]
 item --gap Currently during boot you need to press ctrl+d/ctrl+c
 item --gap repeatedly when init hangs on starting a download
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "systemrescue" %}
@@ -29,7 +30,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz archisobasedir=sysresccd ip=dhcp archiso_http_srv=${url} initrd=initrd
+kernel ${url}vmlinuz archisobasedir=sysresccd ${ipparam} archiso_http_srv=${url} initrd=initrd
 initrd ${url}initrd
 boot
 

+ 4 - 3
roles/netbootxyz/templates/menu/zeninstall.ipxe.j2

@@ -3,11 +3,12 @@
 # Zen Installer for Arch
 # https://sourceforge.net/projects/revenge-installer/
 
-goto ${menu}
-
 :zen
 set os {{ releases.zeninstall.name }}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 menu ${os} Installers
+item --gap Currently during boot you need to press ctrl+d/ctrl+c
+item --gap repeatedly when init hangs on starting a download
 {% for item in releases.zeninstall.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
@@ -17,7 +18,7 @@ goto zen_boot
 :zen_boot
 imgfree
 set url ${live_endpoint}{{ endpoints.zeninstall.path }}
-kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} initrd=initrd
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} initrd=initrd
 initrd ${url}initrd
 boot
 goto zen_exit

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.6
+2.0.6-R1