From 2eff37e59b1978cdfbf38d45ea69aa92acc0ba7f Mon Sep 17 00:00:00 2001 From: freesource Date: Mon, 19 Nov 2001 08:59:38 +0000 Subject: [PATCH] This makes the default replacement directory permanent, rather than calling it over and over again. Right, now busyboxes ldd is being used in Yard.pm for some experiments. --- BootRoot/Yard.pm | 6 ++++-- gbootroot | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index 590b0d4..6dfb75b 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -375,7 +375,8 @@ sub read_contents_file { must_be_abs($file); (-d $file) and cf_warn($contents_file, $line, "left-hand side can't be directory"); - my($abs_replacement) = find_file_in_path($replacement,$main::global_yard); +# my($abs_replacement) = find_file_in_path($replacement,$main::global_yard); + my($abs_replacement) = find_file_in_path($replacement); if (!(defined($abs_replacement) and -e $abs_replacement)) { cf_warn($contents_file, $line, "Can't find $replacement"); @@ -530,7 +531,8 @@ sub library_dependencies { ##### EXECUTABLE LOADABLE BINARY ##### Run ldd to get library dependencies. my $line; - foreach $line (`ldd $file`) { +## + foreach $line (`/usr/i386-linux-uclibc/bin/ldd $file`) { my($lib) = $line =~ / => (\S+)/; next unless $lib; my($abs_lib) = $lib; diff --git a/gbootroot b/gbootroot index 37a83cb..4eed4a9 100755 --- a/gbootroot +++ b/gbootroot @@ -2,11 +2,15 @@ # gBootRoot Copyright (C) 2000, 2001 # +# # AUTHOR # ------ +# # [ Lead Developer and Project Coordinator ] # Jonathan Rosenbaum # +# +# # CONTRIBUTORS # ------------ # @@ -279,6 +283,7 @@ $main::global_yard = $home_yard; $main::oldroot = "/OLDROOT"; my $global_yard_replacements = "/usr/share/gbootroot/yard/Replacements"; my $global_yard_templates = "/usr/share/gbootroot/yard/templates"; +$ENV{'PATH'} = "$home_yard:" . $ENV{'PATH'}; my $initrd; @@ -2876,7 +2881,7 @@ sub lilo_put_it_together { pb($B,7); chdir("$mnt"); #"boot_root: ERROR: Could not change directories\n"; - # This enforces that lilo is only ran on a bootable drive, + # This enforces that lilo is only wil run on a bootable drive, # otherwise the user has to do it manually. if ($container[BOOT_DEVICE] eq $entry_advanced[0]) { #