diff options
4 files changed, 6 insertions, 5 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 b02202cd..19737eaa 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 @@ -22,7 +22,7 @@ for parameter in $(getargs ip=); do info "PXE given net configuration: ip: $ip server_ip: $server_ip gateway_ip: $gateway_ip net_mask: $net_mask" # TODO arch needs enp0s3 and ubuntu needs eth0 here! - local final_dracut_ip_configuration="$ip::$gateway_ip:$net_mask::eth0:off" + local final_dracut_ip_configuration="$ip::$gateway_ip:$net_mask::enp0s3: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 a56a85c7..3da6e07c 100755 --- a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh +++ b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh @@ -1,5 +1,5 @@ -mount /dev/mapper/root "$NEWROOT" # TODO -o make ext4 compatible subvol=root && \ +mount /dev/mapper/root "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS && \ # Write fstab for recognized system partition. # TODO make ubuntu compatible -#sed --in-place --quiet "/^LABEL=${SLX_SYSTEM_PARTITION_LABEL}.*/!s/.*//" \ -# "$NEWROOT/etc/fstab" +sed --in-place --quiet "/^LABEL=${SLX_SYSTEM_PARTITION_LABEL}.*/!s/.*//" \ + "$NEWROOT/etc/fstab" diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 86fb6fdb..dc35ef0c 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -95,7 +95,7 @@ install() { inst_hook mount 10 "$moddir/hooks/mount/mount-root-device.sh" inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh" - inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/mount-tmp.sh" + #inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/mount-tmp.sh" # endregion diff --git a/dev-tools/example-openslx.config b/dev-tools/example-openslx.config index 66b679af..f93fa82f 100644 --- a/dev-tools/example-openslx.config +++ b/dev-tools/example-openslx.config @@ -7,6 +7,7 @@ SLX_SYSTEM_PARTITION_LABEL='system' SLX_PERSISTENT_PARTITION_PATTERN_LABEL_UUID_TYPE='' SLX_TMP_PARTITION_PATTERN_LABEL_UUID_TYPE='' SLX_RAMDISK_SIZE=524288 +SLX_MOUNT_ROOT_OPTIONS='-o subvol=root' # TODO: Following parameter aren't supported yet. SLX_VM_NFS='132.230.4.1:/mnt/lehrpools/dnbd3' |