summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-11-12 14:24:21 +0100
committertorben2015-11-12 14:24:21 +0100
commit740ad9a92a82ea8e05e233664d8dbdccd3f8c0e5 (patch)
tree3e20f4e47c121192b1db9cd208758a498d9ba35e
parentMerge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff)
downloadsystemd-init-740ad9a92a82ea8e05e233664d8dbdccd3f8c0e5.tar.gz
systemd-init-740ad9a92a82ea8e05e233664d8dbdccd3f8c0e5.tar.xz
systemd-init-740ad9a92a82ea8e05e233664d8dbdccd3f8c0e5.zip
Simulate rz pxe kcl.
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh2
-rw-r--r--dev-tools/TFTP/pxelinux.cfg/default2
2 files changed, 2 insertions, 2 deletions
diff --git a/builder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh b/builder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh
index 2000d3fb..0b1c1a14 100755
--- a/builder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh
+++ b/builder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh
@@ -20,7 +20,7 @@ for parameter in $(getargs ip=); do
[ -n "$4" ] && net_mask=$4
warn "PXE given net configuration: ip: $ip server_ip: $server_ip gateway_ip: $gateway_ip net_mask: $net_mask"
- local final_dracut_ip_config="$ip::$gateway_ip:$net_mask:hiwi-test-28:eno1:none"
+ local final_dracut_ip_config="$ip::$gateway_ip:$net_mask::enp0s3:off"
warn "Final dracut ip config: $final_dracut_ip_config"
sed --regexp-extended "s/ip=[^ ]*/ip=$final_dracut_ip_config/g" /proc/cmdline > /fake/cmdline
done
diff --git a/dev-tools/TFTP/pxelinux.cfg/default b/dev-tools/TFTP/pxelinux.cfg/default
index 0ad11be5..271ab2a1 100644
--- a/dev-tools/TFTP/pxelinux.cfg/default
+++ b/dev-tools/TFTP/pxelinux.cfg/default
@@ -8,7 +8,7 @@ MENU TITLE My PXE Boot Menu
LABEL arch
MENU LABEL ^arch network boot
KERNEL /vmlinuz-linux
-APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off vconsole.font=latarcyrheb-sun16 vconsole.keymap=de
+APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15:132.230.4.6:10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de
LABEL BootNormal
MENU LABEL ^Boot Normal (HDD)