From f1ce4bfbc83a10d412919cbd674d98f17d678908 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Apr 2019 11:20:45 +0200 Subject: [PATCH] standby: homogenize standby script across all platforms * Use the same operation order when resuming interfaces * Remove unnecessary delay in ccimx6sbc standby script Signed-off-by: Gabriel Valcazar --- .../recipes-core/busybox/busybox/ccimx6qpsbc/standby | 8 ++++---- .../recipes-core/busybox/busybox/ccimx6sbc/standby | 3 +-- .../recipes-core/busybox/busybox/ccimx8x/standby | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby index 7ac3b94d5..5b4231e42 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby @@ -3,7 +3,7 @@ # # standby # -# Copyright (C) 2017,2018 by Digi International Inc. +# Copyright (C) 2017-2019 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -64,9 +64,6 @@ resume_interfaces() { done fi - # Resume NetworkManager after suspend - ${NM_DAEMON} start - # Resume bluetooth interface if [ -d "/proc/device-tree/bluetooth" ]; then if [ -n "${up_bt_on_resume}" ]; then @@ -74,6 +71,9 @@ resume_interfaces() { ${BT_DAEMON} start >/dev/null fi fi + + # Resume NetworkManager after suspend + ${NM_DAEMON} start } enter_critical_section() { diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby index b3e3f22e7..58ce08bf6 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby @@ -3,7 +3,7 @@ # # standby # -# Copyright (C) 2009-2018 by Digi International Inc. +# Copyright (C) 2009-2019 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -106,7 +106,6 @@ if [ -f "${syspower}" ]; then # Suspend the device printf "mem" > ${syspower} - sleep .5 # Post-resume actions resume_interfaces diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby index a9bb5e00c..2830b7ac8 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby @@ -3,7 +3,7 @@ # # standby # -# Copyright (C) 2018 by Digi International Inc. +# Copyright (C) 2018,2019 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -64,9 +64,6 @@ resume_interfaces() { done fi - # Resume NetworkManager after suspend - ${NM_DAEMON} start - # Resume bluetooth interface if [ -d "/proc/device-tree/bluetooth" ]; then if [ -n "${up_bt_on_resume}" ]; then @@ -74,6 +71,9 @@ resume_interfaces() { ${BT_DAEMON} start >/dev/null fi fi + + # Resume NetworkManager after suspend + ${NM_DAEMON} start } enter_critical_section() {