bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-10-30 23:25:36 -04:00
Code Issues Projects Releases Wiki Activity

Took away global $kernel because it wasn't necessary.

Browse Source
This commit is contained in:
freesource 2001-10-06 04:08:17 +00:00
parent a8b0e2e223
commit 6466adc579
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gbootroot
View File

@ -234,7 +234,7 @@ my $order;
my $text_window; my $text_window;
my $verbosity_window; my $verbosity_window;
# Make @container verbose # Make @container verbose, also look in generate()
my @container; my @container;
use constant METHOD => 0 ; use constant METHOD => 0 ;
use constant KERNEL => 1 ; use constant KERNEL => 1 ;
@ -263,7 +263,7 @@ my @original_container;
my $file_dialog; my $file_dialog;
# These are used in submit # These are used in submit
my ($kernel, $root_image, $size); my ($root_image, $size);
my $mtab; my $mtab;
my ($tmp,$mnt); my ($tmp,$mnt);
@ -2437,7 +2437,7 @@ sub lilo {
sys("rm $tmp/initrd_image.gz") if $ok == 1; sys("rm $tmp/initrd_image.gz") if $ok == 1;
sys("umount $tmp/initrd_mnt"); sys("umount $tmp/initrd_mnt");
$kernel = $container[KERNEL]; my $kernel = $container[KERNEL];
$root_image = $container[ROOT_FS]; $root_image = $container[ROOT_FS];
my $device = $container[BOOT_DEVICE]; my $device = $container[BOOT_DEVICE];
$size = $container[SIZE]; $size = $container[SIZE];
@ -2457,7 +2457,7 @@ sub lilo_put_it_together {
my $B = "boot"; my $B = "boot";
# Time to do a little calculations # Time to do a little calculations
my $device_size = (split(/\s+/,`df $mnt`))[8]; my $device_size = (split(/\s+/,`df $mnt`))[8];
my $boot_size = (stat($kernel))[12]/2 + (stat("$tmp/$initrd"))[12]/2; my $boot_size = (stat($container[KERNEL]))[12]/2 + (stat("$tmp/$initrd"))[12]/2;
my $remain_boot = $device_size - $boot_size; my $remain_boot = $device_size - $boot_size;
pb($B,1); pb($B,1);
@ -2478,7 +2478,7 @@ sub lilo_put_it_together {
info(0, "Copying over kernel\n"); info(0, "Copying over kernel\n");
return if return if
err_custom("rm -rf $mnt/lost+found; cp $kernel $mnt/kernel", err_custom("rm -rf $mnt/lost+found; cp $container[KERNEL]} $mnt/kernel",
"gBootRoot: ERROR: Could not copy over the kernel") == 2; "gBootRoot: ERROR: Could not copy over the kernel") == 2;
pb($B,3); pb($B,3);