From 46ae04040266c61a07b3109fd76d1541d45084c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Wed, 18 Mar 2020 15:58:42 +0100 Subject: [PATCH] F OpenNebula/one#4089: Add changes for Firecracker context support --- src/usr/sbin/one-contextd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/usr/sbin/one-contextd b/src/usr/sbin/one-contextd index dc6370d..61a09ed 100755 --- a/src/usr/sbin/one-contextd +++ b/src/usr/sbin/one-contextd @@ -151,6 +151,7 @@ function get_new_context { { blkid -l -t LABEL='CONTEXT' -o device; blkid -t LABEL='CONTEXT' -o device; + blkid | grep "^.*LABEL=[\"\']*CONTEXT[\"\']*" | awk -F ":" '{print $1}'; } | grep -v '^/dev/loop' | head -n1 ) elif [[ "$distro" == "BSD" ]]; then @@ -166,7 +167,7 @@ function get_new_context { log debug "Mounting CD-ROM ${dev_context} on ${MOUNT_DIR}" if [[ "$distro" == "Linux" ]]; then - mount -t iso9660 -o ro ${dev_context} ${MOUNT_DIR} 2>/dev/null + mount -o ro ${dev_context} ${MOUNT_DIR} 2>/dev/null elif [[ "$distro" == "BSD" ]]; then mount_cd9660 ${dev_context} ${MOUNT_DIR} 2>/dev/null fi