From dafdcb04045d808456533e23d7f6d13d3748e48f Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Sun, 31 May 2015 20:08:59 +0200 Subject: [PATCH] initramfs-rauc-slot: pass the rootfstype kernel parameter to mount This fixes mounting ubifs filesystems. Signed-off-by: Jan Luebbe --- recipes-core/initrdscripts/initramfs-rauc-slot.bb | 2 +- recipes-core/initrdscripts/initramfs-rauc-slot/overlay | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot.bb b/recipes-core/initrdscripts/initramfs-rauc-slot.bb index 62c96d5..755d96d 100644 --- a/recipes-core/initrdscripts/initramfs-rauc-slot.bb +++ b/recipes-core/initrdscripts/initramfs-rauc-slot.bb @@ -2,7 +2,7 @@ SUMMARY = "Modular initramfs system components for RAUC" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" +PR = "r1" inherit allarch diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot/overlay b/recipes-core/initrdscripts/initramfs-rauc-slot/overlay index b1260f6..bed1e10 100644 --- a/recipes-core/initrdscripts/initramfs-rauc-slot/overlay +++ b/recipes-core/initrdscripts/initramfs-rauc-slot/overlay @@ -10,7 +10,10 @@ overlay_run() { if [ -z "$bootparam_root" ]; then fatal "ERROR: No root device was provided." fi - mount -o ro $bootparam_root /slot || fatal "Failed!" + if [ -n "$bootparam_rootfstype" ]; then + mount_arg="-t $bootparam_rootfstype" + fi + mount $mount_arg -o ro $bootparam_root /slot || fatal "Failed!" info "Mounting squashfs..." mkdir /ro-root mount -t squashfs -o loop=/dev/loop0,ro /slot/rootfs.squashfs /ro-root || fatal "Failed!"