Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: udev: mount_digiparts: fix script for R/O systems 

When the system runs as read-only with '/etc' overlayfs enabled, '/sbin/init' is not a symlink
to 'systemd', but '/sbin/init.orig' is. This causes the script to wrongly think than 'systemd'
is not being used. The outcome is that partitions are not being automatically mounted in R/O
systems running in mmc with '/etc' overlayfs enabled, as the specific '/usr/bin/systemd-mount'
binary needs to be invoked in these cases.

The proposed fix performs a second check with '/sbin/init.orig' to determine whether systemd is
being used or not. While on it, add an early check to determine if the partition is already
mounted to exit the script.

Signed-off-by: David Escalona <david.escalona@digi.com>
This commit is contained in:
David Escalona 2023-07-19 13:58:05 +02:00
parent 49614158a6
commit a84d011f16
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta-digi-arm/recipes-core/udev/udev-extraconf/mount_digiparts.sh
View File

@ -3,7 +3,7 @@
# #
# mount_bootparts.sh # mount_bootparts.sh
# #
# Copyright (C) 2014-2022 by Digi International Inc. # Copyright (C) 2014-2023 by Digi International Inc.
# All rights reserved. # All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify it # This program is free software; you can redistribute it and/or modify it
@ -15,6 +15,7 @@
#=============================================================================== #===============================================================================
BASE_INIT="$(readlink -f "@base_sbindir@/init")" BASE_INIT="$(readlink -f "@base_sbindir@/init")"
BASE_INIT_ORIG="$(readlink -f "@base_sbindir@/init.orig")"
INIT_SYSTEMD="@systemd_unitdir@/systemd" INIT_SYSTEMD="@systemd_unitdir@/systemd"
# Partitions are mounted: # Partitions are mounted:
@ -39,6 +40,13 @@ if [ "${PARTNAME}" = "linux" ] || [ "${PARTNAME}" = "linux_a" ] || [ "${PARTNAME
MOUNT_FOLDER="linux" MOUNT_FOLDER="linux"
MOUNT_PARAMS="${MOUNT_PARAMS} -o ro" MOUNT_PARAMS="${MOUNT_PARAMS} -o ro"
fi fi
MOUNTPOINT="/mnt/${MOUNT_FOLDER}"
# Skip if partition is already mounted. For example R/O systems with the '/etc' overlay enabled mount the 'data' partition in very early stages.
if grep -qs "${MOUNTPOINT}" /proc/mounts;
logger "Partition '${PARTNAME}' is already mounted, skipping..."
exit 0
fi
DUALBOOT_MODE="$(fw_printenv -n dualboot 2>/dev/null)" DUALBOOT_MODE="$(fw_printenv -n dualboot 2>/dev/null)"
if [ "${DUALBOOT_MODE}" = "yes" ]; then if [ "${DUALBOOT_MODE}" = "yes" ]; then
@ -51,7 +59,9 @@ if [ "${DUALBOOT_MODE}" = "yes" ]; then
fi fi
fi fi
if [ "x$BASE_INIT" = "x$INIT_SYSTEMD" ];then # R/O systems using 'systemd' and '/etc' overlayfs do not link '/sbin/init' to 'systemd'. In these cases
# 'init' is renamed to 'init.orig' and that is the linked file, so check this case too.
if [ "x$BASE_INIT" = "x$INIT_SYSTEMD" ] || [ "x$BASE_INIT_ORIG" = "x$INIT_SYSTEMD" ]; then
# systemd as init uses systemd-mount to mount block devices # systemd as init uses systemd-mount to mount block devices
# Verify if unit is already launched, if so just restart it. # Verify if unit is already launched, if so just restart it.
@ -85,7 +95,6 @@ else
fi fi
# Create mount point if needed # Create mount point if needed
MOUNTPOINT="/mnt/${MOUNT_FOLDER}"
[ -d "${MOUNTPOINT}" ] || mkdir -p ${MOUNTPOINT} [ -d "${MOUNTPOINT}" ] || mkdir -p ${MOUNTPOINT}
if [ "${SUBSYSTEM}" = "block" ]; then if [ "${SUBSYSTEM}" = "block" ]; then