bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 17:13:22 -05:00
Code Issues Projects Releases Wiki Activity

If the ARS is never opened, $entry_advanced[3] eq "", so now when $um == 0

Browse Source 
it defaults to the value for BOOT_DEVICE.
This commit is contained in:
freesource 2001-11-06 19:16:57 +00:00
parent b26efaef3b
commit 12807a509e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gbootroot
View File

@ -2730,7 +2730,6 @@ sub lilo_put_it_together {
# DEVICES SECTION # DEVICES SECTION
my @devices; my @devices;
my $device_table = "$tmp/boot_device_table.txt"; my $device_table = "$tmp/boot_device_table.txt";
my $norm_root_dev;
if ( $fs_type eq "genext2fs" ) { if ( $fs_type eq "genext2fs" ) {
info(0, "Making $device_table for genext2fs\n"); info(0, "Making $device_table for genext2fs\n");
@ -2758,15 +2757,17 @@ sub lilo_put_it_together {
($norm_root_device) = gdkbirdaao(); ($norm_root_device) = gdkbirdaao();
if ( $norm_root_device ) { if ( $norm_root_device ) {
my @existing_device_test = my @existing_device_test =
grep ( /\/dev\/$norm_root_dev/, @devices ); grep ( /\/dev\/$norm_root_device/, @devices );
if ( !@existing_device_test ) { if ( @existing_device_test ) {
push( @devices, "/dev/$norm_root_device" ); push( @devices, "/dev/$norm_root_device" );
} }
} }
# For frame buffer devices and the like. # For frame buffer devices and the like.
for ( split(" ", $entry_advanced[1] ) ) { if ( $entry_advanced[1] ) {
push(@devices, $_ ) if $_; for ( split(" ", $entry_advanced[1] ) ) {
push(@devices, $_ ) if $_;
}
} }
device_table( @devices ); device_table( @devices );
@ -2902,6 +2903,8 @@ sub lilo_put_it_together {
# different devices to be used. -- now there is $entry_advanced[3] which # different devices to be used. -- now there is $entry_advanced[3] which
# is the ROOT_DEVICE # is the ROOT_DEVICE
if ($um == 0 ) { if ($um == 0 ) {
# ARS was never opened, so root device defaults to boot device.
$entry_advanced[3] = $container[BOOT_DEVICE] if !$entry_advanced[3];
mtab(1); mtab(1);
} }
else { else {