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

* This makes -> literal, before it was backwards. So /bin/sh -> bash works,

Browse Source 
before it had to be /bin/bash -> /bin/sh, so now the ls -l interpretation
  is correct.
* Fixes unitialized values in onto_proc_filesystem.
This commit is contained in:
freesource 2001-08-24 17:33:42 +00:00
parent e140b6bc50
commit 01cb23d3d7
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BootRoot/Yard.pm
View File

@ -177,7 +177,13 @@ sub read_contents_file {
cf_warn($line, "Can't use wildcards in link specification!");
next LINE;
}
my($file, $link) = $line =~ /^(\S+)\s*->\s*(\S+)\s*$/;
## I decided to switch this from ($file,$link) to ($link,$file)
## to make this more intuitive for users so something like
## ls -l /bin/sh which ='s /bin/sh -> /bin/bash is literal
## .. before it was backwards.
my($link, $file) = $line =~ /^(\S+)\s*->\s*(\S+)\s*$/;
if (!defined($link)) {
cf_warn($line, "Can't parse this link");
next LINE;
@ -185,7 +191,10 @@ sub read_contents_file {
##### The '->' supersedes file structure on the disk, so don't
##### call include_file until pass two after all explicit links
##### have been seen.
my($abs_file) = find_file_in_path($file);
## find_file_in_path($file) changed to find_file_in_path($link)
my($abs_file) = find_file_in_path($link);
$Included{$abs_file} = 1 if $abs_file;
#### Have to be careful here. Record the rel link for use
#### in setting up the root fs, but use the abs_link in @files
@ -1650,7 +1659,14 @@ sub onto_proc_filesystem {
my($file) = @_;
my($sdev) = (stat($file))[0];
my($ldev) = (lstat($file))[0];
$sdev == $proc_dev or $ldev == $proc_dev
if ($sdev) {
$sdev = $proc_dev;
}
elsif ($ldev) {
$ldev = $proc_dev;
}
}