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 fixes a major bug which effected copying because of the logic employed.

Browse Source 
Now enoent (unstripped binary) copies properly.  Uid/Gid for /home/user
will need to be handled either through a script which runs on first login,
or directly by the administrator, for now the adm will handle this, but
Replacement user/group are now preserved.  Unless user is in the hosts
group file this is how things need to be done.
This commit is contained in:
freesource 2001-08-22 23:35:49 +00:00
parent 0052df1d3f
commit a94c7537c3
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
BootRoot/Yard.pm
View File

@ -1039,8 +1039,8 @@ sub copy_strip_file {
my $error; my $error;
if ($strippable{$from}) { if ($strippable{$from}) {
# Copy it stripped
# Copy it stripped
if ($strip_lib) { if ($strip_lib) {
if (defined($lib_needed_by{$from})) { if (defined($lib_needed_by{$from})) {
# It's a library # It's a library
@ -1053,6 +1053,26 @@ sub copy_strip_file {
sys("$objcopy --strip-debug $from $to"); sys("$objcopy --strip-debug $from $to");
} }
} }
}
if ($strip_module) {
if (defined($is_module{$from})) {
info(1, "Copy/stripping module $from to $to\n");
sys("$objcopy --strip-debug $from $to");
}
}
if ($strip_bin) {
if (!defined($is_module{$from}) &&
!defined($lib_needed_by{$from})) {
# It's a binary executable
info(1, "Copy/stripping binary executable $from to $to\n");
sys("$objcopy --strip-all $from $to");
}
}
else { # fallback just in case
# Normal copy, no strip
info(1, "Copying $from to $to\n");
sys("cp -a $from $to");
}
# Copy file perms and owner # Copy file perms and owner
my($mode, $uid, $gid); my($mode, $uid, $gid);
@ -1060,49 +1080,15 @@ sub copy_strip_file {
my $from_base = basename($from); my $from_base = basename($from);
chown($uid, $gid, $to) or ($error = chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n")); error("chown: $! \($from_base\)\n"));
##return "ERROR"if $error && $error eq "ERROR"; return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error = chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n")); error("chmod: $! \($from_base\)\n"));
##return "ERROR"if $error && $error eq "ERROR"; return "ERROR"if $error && $error eq "ERROR";
}
elsif ($strip_module) {
info(1, "Copy/stripping module $from to $to\n");
sys("$objcopy --strip-debug $from $to");
# Copy file perms and owner
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from);
chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n"));
##return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
} elsif ($strip_bin) {
# It's a binary executable
info(1, "Copy/stripping binary executable $from to $to\n");
sys("$objcopy --strip-all $from $to");
# Copy file perms and owner
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from);
chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n"));
##return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR";
}
else {
# Normal copy, no strip
sys("cp $from $to");
}
} }
else { else {
# Normal copy, no strip # Normal copy, no strip
sys("cp $from $to"); info(1, "Copying $from to $to\n");
sys("cp -a $from $to");
} }
} }