summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-12-02 23:53:23 +0000
committerColin Guthrie <colin@mageia.org>2013-12-02 23:54:06 +0000
commitf97026e3a01ce14d30ff086c015c64dacd10ddb1 (patch)
tree940c4e4960397a630b3824c636476303d4065ac7 /tools
parent90b6c91391425ad5f2bef237cbe984c19db458e8 (diff)
downloaddrakx-f97026e3a01ce14d30ff086c015c64dacd10ddb1.tar
drakx-f97026e3a01ce14d30ff086c015c64dacd10ddb1.tar.gz
drakx-f97026e3a01ce14d30ff086c015c64dacd10ddb1.tar.bz2
drakx-f97026e3a01ce14d30ff086c015c64dacd10ddb1.tar.xz
drakx-f97026e3a01ce14d30ff086c015c64dacd10ddb1.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/install-xml-file-list4
1 files changed, 3 insertions, 1 deletions
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;