Browse Source

Making sure permissions are preserved for uml_exclusively in contrast to

preserve_ownership.
master
freesource 23 years ago
parent
commit
180b6655de
  1. 5
      BootRoot/Yard.pm
  2. 2
      expect_uml

5
BootRoot/Yard.pm

@ -1584,7 +1584,8 @@ sub copy_strip_file {
(undef, undef, $mode, undef, $uid, $gid) = stat $from; (undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from); my $from_base = basename($from);
if ( $> == 0 || $fs_type eq "genext2fs" ) { if ( $> == 0 || $fs_type eq "genext2fs" ||
$uml_exclusively == 1 ) {
if ( $> == 0 ) { if ( $> == 0 ) {
chown($uid, $gid, $to) or ($error = chown($uid, $gid, $to) or ($error =
@ -1592,8 +1593,6 @@ sub copy_strip_file {
return "ERROR"if $error && $error eq "ERROR"; return "ERROR"if $error && $error eq "ERROR";
} }
# This could be done for uml_exclusively, too
# --freesource
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";

2
expect_uml

@ -52,8 +52,6 @@ $uml->command("mount -t hostfs none -o $mount_point /mnt2");
$uml->command("cp -a /mnt2/* /mnt1"); $uml->command("cp -a /mnt2/* /mnt1");
if ( $preserve_permissions == 0 ) { if ( $preserve_permissions == 0 ) {
$uml->command("chown -R 0:0 /mnt1"); $uml->command("chown -R 0:0 /mnt1");
$uml->command("chmod 0755 /mnt1/lib/libc\.*");
$uml->command("chmod 0755 /mnt1/lib/ld-*");
} }
$uml->command("umount /mnt1; umount /mnt2"); $uml->command("umount /mnt1; umount /mnt2");
$uml->halt(); $uml->halt();

Loading…
Cancel
Save