From 2dac6ee38b1b1595db6ca33fde0bcf034da95e04 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 4 Sep 2024 02:25:25 +0300 Subject: [PATCH] Fix OpenNebula reinstall --- opennebula/install.sh | 4 ++-- opennebula/remotes/datastore/vitastor/oned.conf.diff | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/opennebula/install.sh b/opennebula/install.sh index 14726f41..bc85e4c0 100755 --- a/opennebula/install.sh +++ b/opennebula/install.sh @@ -3,9 +3,9 @@ set -e reapply_patch() { - if ! patch -f --dry-run -l -R $1 < $2 >/dev/null; then + if ! patch -f --dry-run -F 0 -R $1 < $2 >/dev/null; then already_applied=0 - if ! patch --no-backup-if-mismatch -r - -l -f $1 < $2; then + if ! patch --no-backup-if-mismatch -r - -F 0 -f $1 < $2; then applied_ok=0 echo "ERROR: Failed to patch file $1, please apply the patch $2 manually" fi diff --git a/opennebula/remotes/datastore/vitastor/oned.conf.diff b/opennebula/remotes/datastore/vitastor/oned.conf.diff index 43448b66..fb00ffa9 100644 --- a/opennebula/remotes/datastore/vitastor/oned.conf.diff +++ b/opennebula/remotes/datastore/vitastor/oned.conf.diff @@ -54,7 +54,10 @@ index be02d646a8..27f876ec36 100644 TM_MAD_CONF = [ NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES", DS_MIGRATE = "NO", DRIVER = "raw" -@@ -1219,6 +1230,13 @@ DS_MAD_CONF = [ +@@ -1219,9 +1230,16 @@ DS_MAD_CONF = [ + NAME = "ceph", + REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST", + PERSISTENT_ONLY = "NO", MARKETPLACE_ACTIONS = "export" ]