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 /builder | |
| 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.
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh | 3 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh | 7 |
2 files changed, 6 insertions, 4 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" |