diff options
| author | torben | 2015-12-10 15:20:29 +0100 |
|---|---|---|
| committer | torben | 2015-12-10 15:20:29 +0100 |
| commit | df6b1dd620b2ab233d163c1a9f63644be0649b93 (patch) | |
| tree | 3d1065a2a0efbae556c52d7e8fdaf695b4343053 | |
| parent | More fixes for startup.nsh. (diff) | |
| download | systemd-init-df6b1dd620b2ab233d163c1a9f63644be0649b93.tar.gz systemd-init-df6b1dd620b2ab233d163c1a9f63644be0649b93.tar.xz systemd-init-df6b1dd620b2ab233d163c1a9f63644be0649b93.zip | |
Even more fixes in archLinuxStartup.nsh Make KCL reading more resilient.
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh | 3 | ||||
| -rwxr-xr-x | dev-tools/archLinuxStartup.nsh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh index 19865586..e81cf43d 100755 --- a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh +++ b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh @@ -19,7 +19,8 @@ local parameter for parameter in $(getargs BOOTIF=); do info "PXE given boot interface $parameter" local dracut_interface_name="bootnet:$(echo $parameter | \ - sed --regexp-extended 's/.{2}-((.{2}-){5}.{2})/\1/' | sed s/-/:/g)" + sed --regexp-extended 's/.{2}[:\-]((.{2}[:\-]){5}.{2})/\1/' | \ + sed s/-/:/g)" info "Dracut interface name is: $dracut_interface_name" echo -n " ifname=$dracut_interface_name" >> \ "${writeable_proc_cmdline_path}cmdline" diff --git a/dev-tools/archLinuxStartup.nsh b/dev-tools/archLinuxStartup.nsh index 0d272211..90765fb1 100755 --- a/dev-tools/archLinuxStartup.nsh +++ b/dev-tools/archLinuxStartup.nsh @@ -1,5 +1,5 @@ if exist fs0:\debug then rm fs0:\debug - \vmlinuz-linux initrd=\initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=archLinux/ BOOTIF=netboot + \vmlinuz-linux initrd=\initramfs-test.img loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=archLinux/ BOOTIF=01-08-00-27-87-9f-44 endif \vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" |