diff --git a/dm-framework/Makefile b/dm-framework/Makefile index 9bd813fb5..b5abbd689 100755 --- a/dm-framework/Makefile +++ b/dm-framework/Makefile @@ -5,14 +5,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dm-framework -PKG_VERSION:=1.0.4 +PKG_VERSION:=1.0.5 PKG_RELEASE:=1 USE_LOCAL:=0 ifneq ($(USE_LOCAL),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/dm-framework.git -PKG_SOURCE_VERSION:=3ac1679d08fd102cdb5365b41eb049c972e47b38 +PKG_SOURCE_VERSION:=7b9651835010173a4d8af0df0aa6b4a4a2e0b94e PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif diff --git a/dm-framework/dmf_service.json b/dm-framework/dmf_service.json index 61761ab87..b092db188 100644 --- a/dm-framework/dmf_service.json +++ b/dm-framework/dmf_service.json @@ -12,21 +12,21 @@ "config": { "loglevel": "3" }, - "apply_handler": { - "dmmap": [ + "pre_apply_handler": { + "uci": [ { "file": [ - "Bridging" + "network" ], "external_handler": "/etc/dm-framework/dmf_apply_handler.sh" } ] }, "revert_handler": { - "dmmap": [ + "uci": [ { "file": [ - "Bridging" + "network" ], "external_handler": "/etc/dm-framework/dmf_revert_handler.sh" } diff --git a/dm-framework/files/etc/dm-framework/dmf_revert_handler.sh b/dm-framework/files/etc/dm-framework/dmf_revert_handler.sh index 8b93fe568..ffe203e63 100644 --- a/dm-framework/files/etc/dm-framework/dmf_revert_handler.sh +++ b/dm-framework/files/etc/dm-framework/dmf_revert_handler.sh @@ -4,7 +4,7 @@ logger -t dmf.revert_handler "Inputs [$@]" json_init -json_add_string "cmd" "revert" +json_add_string "cmd" "abort" json_compact data="$(json_dump)"