Fix OpenNebula reinstall
This commit is contained in:
@@ -3,9 +3,9 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
reapply_patch() {
|
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
|
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
|
applied_ok=0
|
||||||
echo "ERROR: Failed to patch file $1, please apply the patch $2 manually"
|
echo "ERROR: Failed to patch file $1, please apply the patch $2 manually"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -54,7 +54,10 @@ index be02d646a8..27f876ec36 100644
|
|||||||
TM_MAD_CONF = [
|
TM_MAD_CONF = [
|
||||||
NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
|
NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
|
||||||
DS_MIGRATE = "NO", DRIVER = "raw"
|
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"
|
MARKETPLACE_ACTIONS = "export"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user