Browse Source

Can now generate and create root_fs, compress, and submit for 2-disk system.

master
freesource 24 years ago
parent
commit
3a0188f7fc
  1. 23
      gBootRoot

23
gBootRoot

@ -991,12 +991,11 @@ sub advanced_root_section {
my $accept_b = button_advanced(2,3,8,9,"Accept"); my $accept_b = button_advanced(2,3,8,9,"Accept");
$accept_b->signal_connect("clicked", sub { $accept_b->signal_connect("clicked", sub {
my($tool,$value); my($tool,$value);
if (-e "$mnt/$entry_advanced[4]" ) { if (-e "$tmp/$entry_advanced[4]" ) {
if (!$compression_off->active) { if (!$compression_off->active) {
if ($gz_toggle_root->active) { if ($gz_toggle_root->active) {
$compress = "gzip"; $compress = "gzip";
open(F,"file $mnt/$entry_advanced[4] |"); open(F,"file $tmp/$entry_advanced[4] |");
while (<F>) { while (<F>) {
if (/gzip/) { if (/gzip/) {
info(0, "Already gzip compressed.\n"); info(0, "Already gzip compressed.\n");
@ -1005,18 +1004,18 @@ sub advanced_root_section {
info(0, "Already bzip2 compressed.\n"); info(0, "Already bzip2 compressed.\n");
} }
else { else {
system "$compress $mnt/$entry_advanced[4]"; system "$compress $tmp/$entry_advanced[4]";
$entry_advanced[4] = "$entry_advanced[4].gz"; $entry_advanced[4] = "$entry_advanced[4].gz";
$entry3->set_text("$mnt/$entry_advanced[4]"); $entry3->set_text("$tmp/$entry_advanced[4]");
} }
} }
if ($ear2_save->active) { if ($ear2_save->active) {
return if errcp(sys("cp -a $mnt/$entry_advanced[4] $home_rootfs")) == 2; return if errcp(sys("cp -a $tmp/$entry_advanced[4] $home_rootfs")) == 2;
} }
} }
elsif ($bz2_toggle_root->active) { elsif ($bz2_toggle_root->active) {
$compress = "bzip2"; $compress = "bzip2";
open(F,"file $mnt/$entry_advanced[4] |"); open(F,"file $tmp/$entry_advanced[4] |");
while (<F>) { while (<F>) {
if (/gzip/) { if (/gzip/) {
info(0, "Already gzip compressed.\n"); info(0, "Already gzip compressed.\n");
@ -1025,20 +1024,20 @@ sub advanced_root_section {
info(0, "Already bzip2 compressed.\n"); info(0, "Already bzip2 compressed.\n");
} }
else { else {
system "$compress $mnt/$entry_advanced[4]"; system "$compress $tmp/$entry_advanced[4]";
$entry_advanced[4] = "$entry_advanced[4].bz2"; $entry_advanced[4] = "$entry_advanced[4].bz2";
$entry3->set_text("$mnt/$entry_advanced[4]"); $entry3->set_text("$tmp/$entry_advanced[4]");
} }
} }
if ($ear2_save->active) { if ($ear2_save->active) {
return if errcp(sys("cp -a $mnt/$entry_advanced[4] $home_rootfs")) == 2; return if errcp(sys("cp -a $tmp/$entry_advanced[4] $home_rootfs")) == 2;
} }
} }
} }
else { # off else { # off
$entry3->set_text("$mnt/$entry_advanced[4]"); $entry3->set_text("$tmp/$entry_advanced[4]");
if ($ear2_save->active) { if ($ear2_save->active) {
return if errcp(sys("cp -a $mnt/$entry_advanced[4] $home_rootfs")) == 2; return if errcp(sys("cp -a $tmp/$entry_advanced[4] $home_rootfs")) == 2;
} }
} }
} }

Loading…
Cancel
Save