[arch-projects] [mkinitcpio] [PATCH 1/2] hooks/resume: Remove unused function
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- hooks/resume | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/hooks/resume b/hooks/resume index f514eb6..c0fa0e1 100644 --- a/hooks/resume +++ b/hooks/resume @@ -1,8 +1,6 @@ # vim:set ft=sh: run_hook () { - fmtdevice () { echo "${1}:${2}"; } - if [ -n "${resume}" ]; then if echo ${resume} | grep -q ':'; then # Tux-on-ice syntax: swap:/dev/sda2 or file:/dev/sda2:0xdeadbeef -- 1.7.7.3
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- hooks/resume | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/resume b/hooks/resume index c0fa0e1..e216f42 100644 --- a/hooks/resume +++ b/hooks/resume @@ -2,7 +2,7 @@ run_hook () { if [ -n "${resume}" ]; then - if echo ${resume} | grep -q ':'; then + if [ "${resume}" != "${resume/:}" ]; then # Tux-on-ice syntax: swap:/dev/sda2 or file:/dev/sda2:0xdeadbeef resumedev="$(echo ${resume} | cut -d: -f2)" else @@ -10,7 +10,7 @@ run_hook () resumedev="${resume}" fi if poll_device "${resumedev}" ${rootdelay}; then - if echo ${resume} | grep -q ':'; then + if [ "${resume}" != "${resume/:}" ]; then # Try resuming with tuxonice tuxoniceroot="/sys/power/tuxonice" if [ -d "${tuxoniceroot}" ]; then -- 1.7.7.3
On Mon, Nov 14, 2011 at 08:46:24PM -0300, Gerardo Exequiel Pozzi wrote:
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- hooks/resume | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hooks/resume b/hooks/resume index c0fa0e1..e216f42 100644 --- a/hooks/resume +++ b/hooks/resume @@ -2,7 +2,7 @@ run_hook () { if [ -n "${resume}" ]; then - if echo ${resume} | grep -q ':'; then + if [ "${resume}" != "${resume/:}" ]; then # Tux-on-ice syntax: swap:/dev/sda2 or file:/dev/sda2:0xdeadbeef resumedev="$(echo ${resume} | cut -d: -f2)" else @@ -10,7 +10,7 @@ run_hook () resumedev="${resume}" fi if poll_device "${resumedev}" ${rootdelay}; then - if echo ${resume} | grep -q ':'; then + if [ "${resume}" != "${resume/:}" ]; then # Try resuming with tuxonice tuxoniceroot="/sys/power/tuxonice" if [ -d "${tuxoniceroot}" ]; then -- 1.7.7.3
Ack.
On Mon, Nov 14, 2011 at 08:46:23PM -0300, Gerardo Exequiel Pozzi wrote:
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- hooks/resume | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/hooks/resume b/hooks/resume index f514eb6..c0fa0e1 100644 --- a/hooks/resume +++ b/hooks/resume @@ -1,8 +1,6 @@ # vim:set ft=sh: run_hook () { - fmtdevice () { echo "${1}:${2}"; } - if [ -n "${resume}" ]; then if echo ${resume} | grep -q ':'; then # Tux-on-ice syntax: swap:/dev/sda2 or file:/dev/sda2:0xdeadbeef -- 1.7.7.3
Ack.
participants (2)
-
Dave Reisner
-
Gerardo Exequiel Pozzi