aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-03-04 15:41:49 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-03-11 22:32:50 +0000
commit6e496b0c4a8913501363cbe617eb7060bf2b1434 (patch)
tree879ad93855f921a306edd11e2f1fa53aaa57013f
parent69cdbae73e3a386a55a230bfa80da89d61ad67b0 (diff)
Add fstab=no option in case of netboothalibut_8.0.6halibut/8.0.68.0.6
to avoid systemd fstab generator to mount partitions that do not exist in the netboot case. Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I4c08bd50690062202590d7aae8f6508798f29997
-rw-r--r--templates/machines/qemux86-64.jinja22
-rw-r--r--templates/machines/raspberrypi3.jinja22
-rw-r--r--templates/machines/raspberrypi4.jinja22
3 files changed, 3 insertions, 3 deletions
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index 8d327cf..5365839 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -7,7 +7,7 @@
{%- set device_mach = "x86" %}
{%- set qemu_arch = "x86_64" %}
{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci" %}
-{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda verbose systemd.log_color=false " %}
+{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda verbose systemd.log_color=false fstab=no" %}
{%- set rootfs_type = rootfs_type|default("ramdisk") %}
{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %}
diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2
index 3e2e683..098f392 100644
--- a/templates/machines/raspberrypi3.jinja2
+++ b/templates/machines/raspberrypi3.jinja2
@@ -20,5 +20,5 @@
{{ super() }}
context:
console_device: ttyS0
- custom_kernel_args: "8250.nr_uarts=1 bcm2709.uart_clock=48000000 smsc95xx.macaddr=AA:BB:CC:DD:EE:AA cma=256M bcm2708_fb.fbwidth=1920 bcm2708_fb.fbheight=1080 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.lpm_enable=0 usbhid.mousepoll=0 coherent_pool=6M"
+ custom_kernel_args: "8250.nr_uarts=1 bcm2709.uart_clock=48000000 smsc95xx.macaddr=AA:BB:CC:DD:EE:AA cma=256M bcm2708_fb.fbwidth=1920 bcm2708_fb.fbheight=1080 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.lpm_enable=0 usbhid.mousepoll=0 coherent_pool=6M fstab=no"
{% endblock %}
diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2
index 6737379..05f51c6 100644
--- a/templates/machines/raspberrypi4.jinja2
+++ b/templates/machines/raspberrypi4.jinja2
@@ -19,5 +19,5 @@
{{ super() }}
context:
console_device: ttyS0
- extra_kernel_args: "8250.nr_uarts=1 cma=64M"
+ extra_kernel_args: "8250.nr_uarts=1 cma=64M fstab=no"
{% endblock %}