[gentoo-commits] gentoo-x86 commit in sys-power/pm-utils/files: 1.4.1-echo-n.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    15/07/29 02:56:16

  Added:                1.4.1-echo-n.patch
  Log:
  Fix suspend/hibernate failure when using strange shells like dash-0.5.8.2 (bug #555032, thanks to David Korth et al.)
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

Revision  Changes    Path
1.1                  sys-power/pm-utils/files/1.4.1-echo-n.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-echo-n.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-echo-n.patch?rev=1.1&content-type=text/plain

Index: 1.4.1-echo-n.patch
===================================================================
From ffce4bc35a34b6b543e2ae2828a3096a19ebb1ae Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@g.o>
Date: Tue, 28 Jul 2015 22:24:56 -0400
Subject: [PATCH] Avoid -n in "echo -n foo > /sys/bar"

It's not portable and not needed.

https://bugs.freedesktop.org/show_bug.cgi?id=91497

[ Rebased on top of Gentoo's -r6 patchset. ]
---
 pm/pm-functions.in | 8 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pm/pm-functions.in b/pm/pm-functions.in
index c82be30..a68f955 100644
--- a/pm/pm-functions.in
+++ b/pm/pm-functions.in
@@ -296,13 +296,13 @@
 if [ -z "$SUSPEND_MODULE" ]; then
 	if grep -q mem /sys/power/state; then
 		SUSPEND_MODULE="kernel"
-		do_suspend() { echo -n "mem" >/sys/power/state; }
+		do_suspend() { echo "mem" >/sys/power/state; }
 	elif [ -c /dev/pmu ] && pm-pmu --check; then
 		SUSPEND_MODULE="kernel"
 		do_suspend() { pm-pmu --suspend; }
 	elif grep -q standby /sys/power/state; then
 		SUSPEND_MODULE="kernel"
-		do_suspend() { echo -n "standby" >/sys/power/state; }
+		do_suspend() { echo "standby" >/sys/power/state; }
 	fi
 fi
 
@@ -317,10 +317,10 @@
 		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
 		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
 		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
-		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
-		echo -n "disk" > /sys/power/state
+		echo "${HIBERNATE_MODE}" > /sys/power/disk
+		echo "disk" > /sys/power/state
 		RET=$?
-		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
+		echo "$HIBERNATE_MODE_SAVE" > /sys/power/disk
 		return "$RET"
 	}
 fi
-- 
2.4.6