bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-25 01:43:24 -05:00
Code Issues Projects Releases Wiki Activity

This makes the default replacement directory permanent, rather than calling it over and

Browse Source 
over again.  Right, now busyboxes ldd is being used in Yard.pm for some experiments.
This commit is contained in:
freesource 2001-11-19 08:59:38 +00:00
parent a49dcf6c0d
commit 2eff37e59b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BootRoot/Yard.pm
View File

@ -375,7 +375,8 @@ sub read_contents_file {
must_be_abs($file); must_be_abs($file);
(-d $file) and cf_warn($contents_file, $line, (-d $file) and cf_warn($contents_file, $line,
"left-hand side can't be directory"); "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)) { if (!(defined($abs_replacement) and -e $abs_replacement)) {
cf_warn($contents_file, $line, "Can't find $replacement"); cf_warn($contents_file, $line, "Can't find $replacement");
@ -530,7 +531,8 @@ sub library_dependencies {
##### EXECUTABLE LOADABLE BINARY ##### EXECUTABLE LOADABLE BINARY
##### Run ldd to get library dependencies. ##### Run ldd to get library dependencies.
my $line; my $line;
foreach $line (`ldd $file`) { ##
foreach $line (`/usr/i386-linux-uclibc/bin/ldd $file`) {
my($lib) = $line =~ / => (\S+)/; my($lib) = $line =~ / => (\S+)/;
next unless $lib; next unless $lib;
my($abs_lib) = $lib; my($abs_lib) = $lib;

7
gbootroot
View File

@ -2,11 +2,15 @@
# gBootRoot Copyright (C) 2000, 2001 # gBootRoot Copyright (C) 2000, 2001
# #
#
# AUTHOR # AUTHOR
# ------ # ------
#
# [ Lead Developer and Project Coordinator ] # [ Lead Developer and Project Coordinator ]
# Jonathan Rosenbaum <freesource@users.sourceforge.net> # Jonathan Rosenbaum <freesource@users.sourceforge.net>
# #
#
#
# CONTRIBUTORS # CONTRIBUTORS
# ------------ # ------------
# #
@ -279,6 +283,7 @@ $main::global_yard = $home_yard;
$main::oldroot = "/OLDROOT"; $main::oldroot = "/OLDROOT";
my $global_yard_replacements = "/usr/share/gbootroot/yard/Replacements"; my $global_yard_replacements = "/usr/share/gbootroot/yard/Replacements";
my $global_yard_templates = "/usr/share/gbootroot/yard/templates"; my $global_yard_templates = "/usr/share/gbootroot/yard/templates";
$ENV{'PATH'} = "$home_yard:" . $ENV{'PATH'};
my $initrd; my $initrd;
@ -2876,7 +2881,7 @@ sub lilo_put_it_together {
pb($B,7); pb($B,7);
chdir("$mnt"); #"boot_root: ERROR: Could not change directories\n"; 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. # otherwise the user has to do it manually.
if ($container[BOOT_DEVICE] eq $entry_advanced[0]) { if ($container[BOOT_DEVICE] eq $entry_advanced[0]) {
# #