diff options
| author | torben | 2015-05-04 13:52:03 +0200 |
|---|---|---|
| committer | torben | 2015-05-04 13:52:03 +0200 |
| commit | d46fd801bfade7f69f79b3846d4413c0278fffaa (patch) | |
| tree | 9f1dbd604864db3fa79f10f7636b79323e9c49c1 | |
| parent | Fix. (diff) | |
| download | systemd-init-d46fd801bfade7f69f79b3846d4413c0278fffaa.tar.gz systemd-init-d46fd801bfade7f69f79b3846d4413c0278fffaa.tar.xz systemd-init-d46fd801bfade7f69f79b3846d4413c0278fffaa.zip | |
Pepare merge.
| -rwxr-xr-x | grub2.conf | 2 | ||||
| -rw-r--r-- | readme.md | 3 | ||||
| -rwxr-xr-x | testModule/hooks/cmdlineOLD.sh (renamed from testModule/hooks/cmdline.sh) | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -6,7 +6,7 @@ menuentry 'test' --class centos --class gnu-linux --class gnu --class os --unres insmod part_msdos insmod xfs set root='hd0,msdos1' - linux16 /vmlinuz-3.10.0-229.1.2.el7.x86_64 rw vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.break root=UUID=6c06919a-389a-4a50-8c6b-b086e65db9b0 ip=10.0.2.15:132.230.4.2:10.0.2.2:255.255.255.0 rd.neednet=1 # NOTE: Prevents dracut console: console=tty0 console=ttyS0,9600 ip=enp0s3:dhcp root=/dev/nbd0 rootfstype=ext4 + linux16 /vmlinuz-3.10.0-229.1.2.el7.x86_64 rw vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.break root=dhcp ip=10.0.2.15:132.230.4.2:10.0.2.2:255.255.255.0 rd.neednet=1 # NOTE: Prevents dracut console: console=tty0 console=ttyS0,9600 ip=enp0s3:dhcp root=/dev/nbd0 rootfstype=ext4 #linux16 /vmlinuz-3.10.0-229.1.2.el7.x86_64 rw vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.break rd.debug rd.shell rd.info root=UUID=6c06919a-389a-4a50-8c6b-b086e65db9b0 rd.udev.log-priority=debug ip=10.0.2.15:132.230.4.2:10.0.2.2:255.255.255.0 initrd16 /initramfs-test.img @@ -1,3 +1,6 @@ +# TODO --ommit npd +# TODO Testmenue PW: t + h1. Evaluation, dissection and modification of Linux remote boot h2. Inhalt diff --git a/testModule/hooks/cmdline.sh b/testModule/hooks/cmdlineOLD.sh index 340467df..95f6f6a6 100755 --- a/testModule/hooks/cmdline.sh +++ b/testModule/hooks/cmdlineOLD.sh @@ -17,9 +17,10 @@ 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:dracut_test_client:enp0s3:none" + local final_dracut_ip_config="$ip:$server_ip:$gateway_ip:$net_mask:dracut_test_client:enp0s3:none" warn "Final dracut ip config: $final_dracut_ip_config" replace_cmd ip "$final_dracut_ip_config" + echo "root-path=nfs:$server_ip:/">>/tmp/cmdline done # NOTE: Doesn't work since dracuts needed version of mount doesn't support |