From 990fc27be0653d243ff9906003d624eb4e80e6b4 Mon Sep 17 00:00:00 2001
From: zribiahmed <ahmed.zribi@pivasoftware.com>
Date: Fri, 23 Nov 2012 17:05:05 +0000
Subject: [PATCH] fix scripts bug

---
 src/scripts/functions/common     | 14 +++++++-------
 src/scripts/functions/lan_device |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/scripts/functions/common b/src/scripts/functions/common
index 18a4bfa..bfc73fa 100644
--- a/src/scripts/functions/common
+++ b/src/scripts/functions/common
@@ -46,22 +46,22 @@ fi
 
 case "$action" in
 	get_value)
-	ubus call tr069 GetParameterValues '{"parameter": "'$parameter'", "value": "'$value'", "type": "'$type'", "fault_code":"'$fault_code'"}'
+	ubus call tr069 GetParameterValues '{"parameter": "'$parameter'", "value": "'$value'", "type": "'$type'", "fault_code":"'$fault_code'"}' 2> /dev/null
 	;;
 	get_name)
-	ubus call tr069 GetParameterNames '{"parameter": "'$parameter'", "writable": "'$value'", "fault_code":"'$fault_code'"}'
+	ubus call tr069 GetParameterNames '{"parameter": "'$parameter'", "writable": "'$value'", "fault_code":"'$fault_code'"}' 2> /dev/null
 	;;
 	get_notification)
-	ubus call tr069 GetParameterAttributes '{"parameter": "'$parameter'", "notification": "'$value'", "fault_code":"'$fault_code'"}'
+	ubus call tr069 GetParameterAttributes '{"parameter": "'$parameter'", "notification": "'$value'", "fault_code":"'$fault_code'"}' 2> /dev/null
 	;;
 	add_object)
 	local instance="$1"
 	local status="$2"
-	ubus call tr069 AddObject '{"instance":"'$instance'", "status":"'$status'", "fault_code":"'$fault_code'"}'
+	ubus call tr069 AddObject '{"instance":"'$instance'", "status":"'$status'", "fault_code":"'$fault_code'"}' 2> /dev/null
 	;;
 	delete_object)
 	local status="$1"
-	ubus call tr069 DelObject '{ "status": "'$status'", "fault_code": "'$fault_code'" }'
+	ubus call tr069 DelObject '{ "status": "'$status'", "fault_code": "'$fault_code'" }' 2> /dev/null
 	;;
 esac
 }
@@ -71,10 +71,10 @@ local parameter="$1"
 local fault_code="$2"
 case "$action" in
 	apply_value)
-	ubus call tr069 SetParameterValuesFault '{"parameter": "'$parameter'", "fault_code":"'$fault_code'"}'
+	ubus call tr069 SetParameterValuesFault '{"parameter": "'$parameter'", "fault_code":"'$fault_code'"}' 2> /dev/null
 	;;
 	apply_notification)
-	ubus call tr069 SetParameterAttributes '{"fault_code":"'$fault_code'"}'
+	ubus call tr069 SetParameterAttributes '{"fault_code":"'$fault_code'"}' 2> /dev/null
 	;;
 esac
 }
diff --git a/src/scripts/functions/lan_device b/src/scripts/functions/lan_device
index e50718d..2781fff 100644
--- a/src/scripts/functions/lan_device
+++ b/src/scripts/functions/lan_device
@@ -98,8 +98,8 @@ add_ip_interface() {
 	done
 	let instance=$instance+1
 	freecwmp_add_lan_device_ip_interface "$1$instance." "$instance"
-	ubus_freecwmp_output "$instance" "0"
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit
+	ubus_freecwmp_output "$instance" "0"
 }
 
 get_ip_interface() {
@@ -201,6 +201,7 @@ delete_ip_interface() {
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} delete cwmp.@object[$1]
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} delete network.lan$indice
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit
+	ubus_freecwmp_output "0"
 }
 
 add_lan_device() {