diff options
| author | Ubuntu <ubuntu@cert-jenkins-slave-1-201406-15260.maas> | 2022-07-12 00:20:52 +0000 |
|---|---|---|
| committer | Ubuntu <ubuntu@cert-jenkins-slave-1-201406-15260.maas> | 2022-07-12 00:20:52 +0000 |
| commit | eb911c174c3a5880acaee9235fd9cc90e0fb85f2 (patch) | |
| tree | eabe186909f563d250c7ccf480638ca833c5607b /units | |
| parent | 2c7d8f37df86c4ed84a82301372e51ddd19d47ee (diff) | |
| parent | 229cc3edf22bc6031b3103f743d0583d2701b581 (diff) | |
Merge #425837 from ~rickwu4444/plainbox-provider-checkbox:change-suspend-method-if-using-rtcwake
Change: Change suspend method if using rtcwake Due to rtcwake is calling kernel power states directly to put system into suspend. That will cause user space services didn't been handle. Therefore, using systemd to handle suspend would be better for handle the user space services.
Diffstat (limited to 'units')
| -rw-r--r-- | units/stress/s3s4.pxu | 3 | ||||
| -rw-r--r-- | units/suspend/suspend.pxu | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/units/stress/s3s4.pxu b/units/stress/s3s4.pxu index 77b9af6..9bf6ea7 100644 --- a/units/stress/s3s4.pxu +++ b/units/stress/s3s4.pxu @@ -63,7 +63,8 @@ command: for i in {1..{{ s3_iterations }}}; do echo "Iteration $i" - rtcwake -v -m mem -s "${STRESS_S3_SLEEP_DELAY:-30}" + rtcwake -v -m on -s "${STRESS_S3_SLEEP_DELAY:-30}" & + systemctl suspend done {% endif -%} _description: diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index 1225d90..9d905da 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -202,9 +202,11 @@ command: else echo "Calling rtcwake" if [ -z "$RTC_DEVICE_FILE" ]; then - rtcwake -m mem -s 30 + rtcwake -m on -s 30 & + systemctl suspend else - rtcwake -d "$RTC_DEVICE_FILE" -m mem -s 30 + rtcwake -d "$RTC_DEVICE_FILE" -m on -s 30 & + systemctl suspend fi fi else @@ -285,9 +287,11 @@ command: else echo "Calling rtcwake" if [ -z "$RTC_DEVICE_FILE" ]; then - rtcwake -m mem -s 30 + rtcwake -m on -s 30 & + systemctl suspend else - rtcwake -d "$RTC_DEVICE_FILE" -m mem -s 30 + rtcwake -d "$RTC_DEVICE_FILE" -m on -s 30 & + systemctl suspend fi fi estimated_duration: 90.000 |