ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-19 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use dbus-send to get current boot block device instead of fdisk

Browse Source 
Closes: #2150
Change-type: patch
Signed-off-by: Christina Ying Wang <christina@balena.io>
This commit is contained in:
Christina Ying Wang 2023-03-29 16:55:46 -07:00
parent 980c838e44
commit 4ab8250c97
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entry.sh
View File

@ -15,8 +15,6 @@ source ./mount-partitions.sh
[ -d "${ROOT_MOUNTPOINT}"/tmp/balena-supervisor ] || [ -d "${ROOT_MOUNTPOINT}"/tmp/balena-supervisor ] ||
mkdir -p "${ROOT_MOUNTPOINT}"/tmp/balena-supervisor mkdir -p "${ROOT_MOUNTPOINT}"/tmp/balena-supervisor
export DBUS_SYSTEM_BUS_ADDRESS="${DBUS_SYSTEM_BUS_ADDRESS:-unix:path="${ROOT_MOUNTPOINT}"/run/dbus/system_bus_socket}"
# Include self-signed CAs, should they exist # Include self-signed CAs, should they exist
if [ -n "${BALENA_ROOT_CA}" ]; then if [ -n "${BALENA_ROOT_CA}" ]; then
if [ ! -e '/etc/ssl/certs/balenaRootCA.pem' ]; then if [ ! -e '/etc/ssl/certs/balenaRootCA.pem' ]; then

30
mount-partitions.sh
View File

@ -3,14 +3,33 @@
# Mounts boot, state, & data partitions from balenaOS. # Mounts boot, state, & data partitions from balenaOS.
# The container must be privileged for this to function correctly. # The container must be privileged for this to function correctly.
# Set overlayfs root mountpoint
export ROOT_MOUNTPOINT="/mnt/root"
# Set DBus system bus address for getting the current boot block device
export DBUS_SYSTEM_BUS_ADDRESS="${DBUS_SYSTEM_BUS_ADDRESS:-unix:path="${ROOT_MOUNTPOINT}"/run/dbus/system_bus_socket}"
# Get the current boot block device in case there are duplicate partition labels # Get the current boot block device in case there are duplicate partition labels
# for `(balena|resin)-(boot|state|data)` found. # for `(balena|resin)-(boot|state|data)` found.
current_boot_block_device="" current_boot_block_device=""
if [ "${TEST}" != 1 ]; then if [ "${TEST}" != 1 ]; then
current_boot_partition=$(fdisk -l | grep '* ' | cut -d' ' -f1 2>&1) # Get the current boot block device from systemd
current_boot_block_device=$(lsblk -no pkname "${current_boot_partition}") # The dbus-send command below should return something like:
# ```
# method return time=1680132905.878117 sender=:1.0 -> destination=:1.20155 serial=245193 reply_serial=2
# variant string "/dev/sda1"
# ```
mnt_boot_mount=$(dbus-send --system --print-reply \
--dest=org.freedesktop.systemd1 /org/freedesktop/systemd1/unit/mnt_2dboot_2emount org.freedesktop.DBus.Properties.Get \
string:"org.freedesktop.systemd1.Mount" string:"What" | grep "string" | cut -d'"' -f2 2>&1)
# If the output doesn't match the /dev/* device regex, exit with an error
if [ "$(echo "${mnt_boot_mount}" | grep -E '^/dev/')" = "" ]; then
echo "ERROR: Could not determine boot device from dbus. Please launch Supervisor as a privileged container with DBus socket access."
exit 1
fi
current_boot_block_device=$(lsblk -no pkname "${mnt_boot_mount}")
if [ "${current_boot_block_device}" = "" ]; then if [ "${current_boot_block_device}" = "" ]; then
echo "ERROR: Could not determine boot device. Please launch Supervisor as a privileged container with host networking." echo "ERROR: Could not determine boot device from lsblk. Please launch Supervisor as a privileged container."
exit 1 exit 1
fi fi
fi fi
@ -65,9 +84,6 @@ setup_then_mount() {
exit 1 exit 1
} }
# Set overlayfs root mountpoint
export ROOT_MOUNTPOINT="/mnt/root"
# Set boot mountpoint # Set boot mountpoint
BOOT_MOUNTPOINT="/mnt/boot" BOOT_MOUNTPOINT="/mnt/boot"
setup_then_mount "boot" "${BOOT_MOUNTPOINT}" setup_then_mount "boot" "${BOOT_MOUNTPOINT}"
@ -94,7 +110,7 @@ export DATA_MOUNTPOINT
# TODO: DB should be moved to a managed volume and mounted to /data in-container. # TODO: DB should be moved to a managed volume and mounted to /data in-container.
# Handle the case of such a Supervisor volume already existing. # Handle the case of such a Supervisor volume already existing.
# NOTE: After this PR, it should be good to remove the OS's /data/database.sqlite mount. # NOTE: After this PR, it should be good to remove the OS's /data/database.sqlite mount.
if [ ! -f /data/database.sqlite ]; then if [ ! -f /data/database.sqlite ] && [ "${TEST}" != 1 ]; then
mkdir -p "${DATA_MOUNTPOINT}/resin-data/balena-supervisor" mkdir -p "${DATA_MOUNTPOINT}/resin-data/balena-supervisor"
mount -o bind,shared "${DATA_MOUNTPOINT}"/resin-data/balena-supervisor /data mount -o bind,shared "${DATA_MOUNTPOINT}"/resin-data/balena-supervisor /data
fi fi