standby: rename suspend script to standby

The suspend script has conflicts with the suspend from bash, then
we decided to rename our custom suspend script to standby and create
a symlink called suspend to maintain backward compatibility.

https://jira.digi.com/browse/DEL-5622

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2018-02-02 16:30:05 +01:00
parent 2ae061cbab
commit 81c0f027f8
8 changed files with 24 additions and 22 deletions

View File

@ -1,3 +1,3 @@
#s_type n_type(hex) s_code n_code value description
EV_KEY 0x01 KEY_SLEEP 142 1 pswitch-suspend
EV_KEY 0x01 KEY_SLEEP 142 1 pswitch-standby
EV_KEY 0x01 KEY_POWER 116 0 pswitch-poweroff

View File

@ -1,9 +1,9 @@
#!/bin/sh
#===============================================================================
#
# suspend
# standby
#
# Copyright (C) 2017 by Digi International Inc.
# Copyright (C) 2017,2018 by Digi International Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or modify it
@ -15,7 +15,7 @@
#
#===============================================================================
scriptname="$(basename ${0})"
scriptname="$(basename $(readlink -f ${0}))"
syspower="/sys/power/state"
lockfile="/var/lock/${scriptname}.lock"
lockfd="9"

View File

@ -1,9 +1,9 @@
#!/bin/sh
#===============================================================================
#
# suspend
# standby
#
# Copyright (C) 2009-2017 by Digi International Inc.
# Copyright (C) 2009-2018 by Digi International Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or modify it
@ -15,7 +15,7 @@
#
#===============================================================================
scriptname="$(basename ${0})"
scriptname="$(basename $(readlink -f ${0}))"
syspower="/sys/power/state"
lockfile="/var/lock/${scriptname}.lock"
lockfd="9"

View File

@ -1,3 +1,3 @@
#s_type n_type(hex) s_code n_code value description
EV_KEY 0x01 KEY_SLEEP 142 1 pswitch-suspend
EV_KEY 0x01 KEY_SLEEP 142 1 pswitch-standby
EV_KEY 0x01 KEY_POWER 116 1 pswitch-poweroff

View File

@ -1,9 +1,9 @@
#!/bin/sh
#===============================================================================
#
# suspend
# standby
#
# Copyright (C) 2016, 2017 by Digi International Inc.
# Copyright (C) 2016-2018 by Digi International Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or modify it
@ -15,7 +15,7 @@
#
#===============================================================================
scriptname="$(basename ${0})"
scriptname="$(basename $(readlink -f ${0}))"
syspower="/sys/power/state"
lockfile="/var/lock/${scriptname}.lock"
lockfd="9"

View File

@ -0,0 +1,4 @@
#!/bin/sh
logger -t acpid "Power key standby request."
exec /bin/standby

View File

@ -1,4 +0,0 @@
#!/bin/sh
logger -t acpid "Power key suspend request."
exec /bin/suspend

View File

@ -1,16 +1,16 @@
# Copyright (C) 2013 Digi International.
# Copyright (C) 2013-2018 Digi International.
FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
SRC_URI += "file://0001-del-baudrates.patch \
file://0002-ntpd-indefinitely-try-to-resolve-peer-addresses.patch \
file://suspend \
file://standby \
file://busybox-ntpd \
file://index.html \
file://digi-logo.png \
file://busybox-acpid \
file://acpid.map \
file://pswitch-suspend \
file://pswitch-standby \
file://pswitch-poweroff \
file://busybox-static-nodes \
file://bridgeifupdown \
@ -29,7 +29,7 @@ INITSCRIPT_NAME_${PN}-ntpd = "busybox-ntpd"
PACKAGES =+ "${PN}-acpid"
FILES_${PN}-acpid = " ${sysconfdir}/init.d/busybox-acpid \
${sysconfdir}/acpi/acpid.map \
${sysconfdir}/acpi/pswitch-suspend \
${sysconfdir}/acpi/pswitch-standby \
${sysconfdir}/acpi/pswitch-poweroff \
"
INITSCRIPT_PACKAGES =+ "${PN}-acpid"
@ -53,13 +53,15 @@ do_install_append() {
install -m 0644 ${WORKDIR}/index.html ${D}/srv/www/
install -m 0644 ${WORKDIR}/digi-logo.png ${D}/srv/www/
fi
# Install 'suspend' script
install -m 0755 ${WORKDIR}/suspend ${D}${base_bindir}
# Install 'standby' script
install -m 0755 ${WORKDIR}/standby ${D}${base_bindir}
# Create a symlink called suspend to maintain backward compatibility
ln -s standby ${D}${base_bindir}/suspend
if grep "CONFIG_ACPID=y" ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/busybox-acpid ${D}${sysconfdir}/init.d/
install -d ${D}${sysconfdir}/acpi/
install -m 0755 ${WORKDIR}/acpid.map ${D}${sysconfdir}/acpi/
install -m 0755 ${WORKDIR}/pswitch-suspend ${D}${sysconfdir}/acpi/
install -m 0755 ${WORKDIR}/pswitch-standby ${D}${sysconfdir}/acpi/
install -m 0755 ${WORKDIR}/pswitch-poweroff ${D}${sysconfdir}/acpi/
fi
if grep "CONFIG_MAKEDEVS=y" ${WORKDIR}/defconfig; then