Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/prelink/files/
Date: Fri, 23 Aug 2019 06:49:15
Message-Id: 1566542941.d1be2b4aae769dc42b8dee38ebac5439458207ff.slyfox@gentoo
1 commit: d1be2b4aae769dc42b8dee38ebac5439458207ff
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 23 06:48:10 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 23 06:49:01 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1be2b4a
7
8 sys-devel/prelink: ignore warnings from 'ldd /sbin/init'
9
10 /sbin/init might not exist at all. Let's not generate
11 text output in this case.
12
13 Reported-by: Anthony Parsons
14 Closes: https://bugs.gentoo.org/678348
15 Package-Manager: Portage-2.3.72, Repoman-2.3.17
16 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
17
18 sys-devel/prelink/files/prelink.cron | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/sys-devel/prelink/files/prelink.cron b/sys-devel/prelink/files/prelink.cron
22 index a3edc429fee..067fc2ea97a 100644
23 --- a/sys-devel/prelink/files/prelink.cron
24 +++ b/sys-devel/prelink/files/prelink.cron
25 @@ -55,7 +55,7 @@ fi
26 echo /usr/sbin/prelink -av $PRELINK_OPTS > ${log}
27 /usr/sbin/prelink -av $PRELINK_OPTS >> ${log} 2>&1 \
28 || echo Prelink failed with return value $? >> ${log}
29 -# Restart init if needed
30 -[ -n "$(find `ldd /sbin/init | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
31 +# Restart init if needed (and if exists)
32 +[ -n "$(find `ldd /sbin/init 2>/dev/null | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
33
34 exit 0