From 7a5dc8a73bfecfc4d45a5527a1d47b8d8a0fc8ce Mon Sep 17 00:00:00 2001 From: freesource Date: Fri, 21 Dec 2001 02:50:01 +0000 Subject: [PATCH] Changed preserve_permissions to preserve_ownership. --- BootRoot/Yard.pm | 8 +++++--- BootRoot/YardBox.pm | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index 0af16c1..9fbfd22 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -91,13 +91,13 @@ sub warning { sub verbosity { $verbosity = $_[0]; } sub text_insert { $text_insert = $_[0]; $red = $_[1]; $blue = $_[2]; } sub logadj { $logadj = $_[0]; } -my ($ars, $kernel, $kernel_version_choice, $uml_exclusively, $preserve_permissions); +my ($ars, $kernel, $kernel_version_choice, $uml_exclusively, $preserve_ownership); sub ars2 { $ars = $_[0]; $kernel = $ars->{kernel}; $kernel_version_choice = $ars->{kernel_version_choice}; $uml_exclusively = $ars->{uml_exclusively}; - $preserve_permissions = $ars->{preserve_permissions}; + $preserve_ownership = $ars->{preserve_ownership}; } @@ -1401,7 +1401,7 @@ sub create_filesystem { my $x_count = 1; my $command_line = "$expect_program $ubd0 $ubd1 $options " . - "$mount_point $preserve_permissions $filesystem"; + "$mount_point $preserve_ownership $filesystem"; info(1,"\n$command_line\n\n"); @@ -1592,6 +1592,8 @@ sub copy_strip_file { return "ERROR"if $error && $error eq "ERROR"; } + # This could be done for uml_exclusively, too + # --freesource chmod($mode, $to) or ($error = error("chmod: $! \($from_base\)\n")); return "ERROR"if $error && $error eq "ERROR"; diff --git a/BootRoot/YardBox.pm b/BootRoot/YardBox.pm index c18dd1a..d223cbc 100644 --- a/BootRoot/YardBox.pm +++ b/BootRoot/YardBox.pm @@ -280,12 +280,12 @@ sub filesystem_size { if ( $> == 0 ) { $uml_expect{uml_exclusively} = 0 if !$uml_expect{uml_exclusively}; - $uml_expect{preserve_permissions} = 1 if - !$uml_expect{preserve_permissions}; + $uml_expect{preserve_ownership} = 1 if + !$uml_expect{preserve_ownership}; $ars->{uml_exclusively} = $uml_expect{uml_exclusively}; ars2($ars); - $ars->{preserve_permissions} = $uml_expect{preserve_permissions}; + $ars->{preserve_ownership} = $uml_expect{preserve_ownership}; ars2($ars); @@ -319,10 +319,10 @@ sub filesystem_size { $ars->{uml_exclusively} = $uml_expect{uml_exclusively}; ars2($ars); - $uml_expect{preserve_permissions} = 0 if - !$uml_expect{preserve_permissions}; + $uml_expect{preserve_ownership} = 0 if + !$uml_expect{preserve_ownership}; - $ars->{preserve_permissions} = $uml_expect{preserve_permissions}; + $ars->{preserve_ownership} = $uml_expect{preserve_ownership}; ars2($ars); } @@ -404,31 +404,31 @@ sub file_system { #_______________________________________ - # Preserve Permissions + # Preserve Ownership # # root = selected # normal user = not selected # - my $preserve_permissions = new - Gtk::CheckButton("Preserve Permissions"); + my $preserve_ownership = new + Gtk::CheckButton("Preserve Ownership"); #$uml_exclusively->signal_connect("clicked", \&which_stage, "check"); - $table_filesystem->attach($preserve_permissions,2,3,1,2,['expand'], + $table_filesystem->attach($preserve_ownership,2,3,1,2,['expand'], ['fill','shrink'],0,0); - $preserve_permissions->active($uml_expect{preserve_permissions}); - $preserve_permissions->signal_connect("button_press_event", + $preserve_ownership->active($uml_expect{preserve_ownership}); + $preserve_ownership->signal_connect("button_press_event", sub { - if ( $preserve_permissions->get_active() == 1 ) { - $uml_expect{preserve_permissions} = 0; + if ( $preserve_ownership->get_active() == 1 ) { + $uml_expect{preserve_ownership} = 0; } else { - $uml_expect{preserve_permissions} = 1; + $uml_expect{preserve_ownership} = 1; } - $ars->{preserve_permissions} = - $uml_expect{preserve_permissions}; + $ars->{preserve_ownership} = + $uml_expect{preserve_ownership}; ars2($ars); }); - $preserve_permissions->show; + $preserve_ownership->show; #_______________________________________