diff options
| author | torben | 2015-11-26 20:12:49 +0100 |
|---|---|---|
| committer | torben | 2015-11-26 20:12:49 +0100 |
| commit | eeaa514c2291f716ce168bbeccb24f5873b56527 (patch) | |
| tree | 34929004fa1b5876859507dd75a0aec7d41d48c8 | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
| download | systemd-init-eeaa514c2291f716ce168bbeccb24f5873b56527.tar.gz systemd-init-eeaa514c2291f716ce168bbeccb24f5873b56527.tar.xz systemd-init-eeaa514c2291f716ce168bbeccb24f5873b56527.zip | |
Sync.
4 files changed, 12 insertions, 9 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 658fb195..b02202cd 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 @@ -21,7 +21,8 @@ for parameter in $(getargs ip=); do [ -n "$4" ] && net_mask=$4 info "PXE given net configuration: ip: $ip server_ip: $server_ip gateway_ip: $gateway_ip net_mask: $net_mask" - local final_dracut_ip_configuration="$ip::$gateway_ip:$net_mask::enp0s3:off" + # TODO arch needs enp0s3 and ubuntu needs eth0 here! + local final_dracut_ip_configuration="$ip::$gateway_ip:$net_mask::eth0:off" info "Final dracut ip configuration is: $final_dracut_ip_configuration" sed --regexp-extended "s/ip=[^ ]*/ip=$final_dracut_ip_configuration/g" \ /proc/cmdline > "${writeable_proc_cmdline_path}cmdline" diff --git a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh index 6b29d84b..a56a85c7 100755 --- a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh +++ b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh @@ -1,4 +1,5 @@ -mount /dev/mapper/root "$NEWROOT" -o subvol=root && \ +mount /dev/mapper/root "$NEWROOT" # TODO -o make ext4 compatible subvol=root && \ # Write fstab for recognized system partition. -sed --in-place --quiet "/^LABEL=${SLX_SYSTEM_PARTITION_LABEL}.*/!s/.*//" \ - "$NEWROOT/etc/fstab" +# TODO make ubuntu compatible +#sed --in-place --quiet "/^LABEL=${SLX_SYSTEM_PARTITION_LABEL}.*/!s/.*//" \ +# "$NEWROOT/etc/fstab" diff --git a/dev-tools/virtualBoxTFTPRoot/.gitignore b/dev-tools/virtualBoxTFTPRoot/.gitignore index 22535dbd..1a6307a5 100644 --- a/dev-tools/virtualBoxTFTPRoot/.gitignore +++ b/dev-tools/virtualBoxTFTPRoot/.gitignore @@ -1,2 +1,2 @@ *.img -vmlinuz-linux +*vmlinuz-linux diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 6d01d549..36bc382e 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -7,13 +7,14 @@ 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 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/ vga=current +KERNEL /archLinux-vmlinuz-linux +APPEND initrd=/archLinux-initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root 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/ vga=current LABEL ubuntu MENU LABEL ^ubuntu network boot -KERNEL /vmlinuz-linux -APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root 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=ubuntu/ vga=current +KERNEL /ubuntu-vmlinuz-linux +APPEND initrd=/ubuntu-initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 net.ifnames=1 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=ubuntu/ vga=current +# TODO vconsole.font=latarcyrheb-sun16 LABEL BootNormal MENU LABEL ^Boot Normal (HDD) |