From f97026e3a01ce14d30ff086c015c64dacd10ddb1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Dec 2013 23:53:23 +0000 Subject: tools: Get rid of the 'many matches for binary' warning due to usrmove. This ignores /sbin and /bin paths then they are symlinks and avoids misleading messages being printed when building stage2 and rescue --- tools/install-xml-file-list | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/install-xml-file-list') diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 0dc1b2e4e..7bd0588fe 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -258,7 +258,9 @@ sub install { } elsif ($expand eq 'binary') { $disallow_from_dir->(); - my @PATH = qw(/sbin /bin /usr/sbin /usr/bin /usr/X11R6/bin); + my @PATH = qw(/usr/sbin /usr/bin /usr/X11R6/bin); + unshift(@PATH, "/bin") unless ( -l "/bin" ); + unshift(@PATH, "/sbin") unless ( -l "/sbin" ); foreach my $name (map { expand_macros($_) } @text_l) { my @l = grep { -x $_ } map { "$_/$name" } @PATH; @l or error("can't find binary $name"), next; -- cgit v1.2.1