On 26.03.2015 14:26, arekm wrote:
commit ace0a232791812ed503f131a5653c251b9fe1099
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Thu Mar 26 13:26:16 2015 +0100

     Prefer suspend/resume binary over initrd/resume. Install previously found 
binary instead hardcoded one.

  mod-suspend.sh | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/mod-suspend.sh b/mod-suspend.sh
index 48efd57..d905bd0 100644
--- a/mod-suspend.sh
+++ b/mod-suspend.sh
@@ -13,7 +13,7 @@ setup_mod_suspend() {
                warn "Tuxonice and mainline suspend are exclusive!"
        fi
- resume=$(find_tool $initrd_dir/resume /usr/${_lib}/suspend/resume /usr/sbin/resume)
+       resume=$(find_tool /usr/${_lib}/suspend/resume $initrd_dir/resume 
/usr/sbin/resume)

_lib is no longer reliable

1366 if [ -d /libx32 -a -d /usr/libx32 ]; then
1367     _lib=libx32
1368 elif [ -d /lib64 -a -d /usr/lib64 ]; then
1369     _lib=lib64
1370 else
1371     _lib=lib
1372 fi
1373

as lines 1366 and 1368 *both* are valid on x86_64 AND x32 system...

i guess you should write there all $lib combinations (lib, lib64, libx32) unless can improve the _lib check.

--
glen

_______________________________________________
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en

Reply via email to