Re: [projects/geninitrd] Prefer suspend/resume binary over initrd/resume. Install previously found binary instead hardcoded o
On 26.03.2015 14:35, Arkadiusz Miśkiewicz wrote:
Well, for now above checking needs to be reverted to never break x8664
systems.
it's does not seem to be used for anything important than suspend and
multipath and uclibc binaries
[~/rpm/packages/geninitrd/geninitrd (master)⚡] ➔ rgrep -r _lib .
--exclude=ChangeLog
./mod-suspend.sh:16:resume=$(find_tool $initrd_dir/resume
/usr/${_lib}/suspend/resume /usr/sbin/resume)
./mod-suspend.sh:61:if [ -x /usr/${_lib}/suspend/resume ]; then
./mod-suspend.sh:62:inst_exec /usr/${_lib}/suspend/resume
/bin/resume
./mod-multipath.sh:115: local scsi_id=$(find_tool /$_lib/udev/scsi_id
/lib/udev/scsi_id /sbin/scsi_id)
./mod-multipath.sh:118: if [ -d /$_lib/multipath ]; then
./mod-multipath.sh:119: inst_d /$_lib/multipath
./mod-multipath.sh:120: inst_exec /$_lib/multipath/*
/$_lib/multipath
./geninitrd:556:if [ -f $DESTDIR/$_lib/libc.so.0 ]; then
./geninitrd:557:lib=$DESTDIR/$_lib/libc.so.0
./geninitrd:563:verbose + ln -s /$_lib
$DESTDIR$libdir
./geninitrd:564:ln -s /$_lib $DESTDIR$libdir
./geninitrd:1367: _lib=libx32
./geninitrd:1369: _lib=lib64
./geninitrd:1371: _lib=lib
./geninitrd:1378:debug Using _lib: $_lib
[~/rpm/packages/geninitrd/geninitrd (master)⚡] ➔
--
glen
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
Re: [projects/geninitrd] Prefer suspend/resume binary over initrd/resume. Install previously found binary instead hardcoded o
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
Re: [projects/geninitrd] Prefer suspend/resume binary over initrd/resume. Install previously found binary instead hardcoded o
On Thursday 26 of March 2015, Elan Ruusamäe wrote:
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...
Well, for now above checking needs to be reverted to never break x8664
systems.
--
Arkadiusz Miśkiewicz, arekm / ( maven.pl | pld-linux.org )
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
