|
@ -501,6 +501,10 @@ else { |
|
|
# /tmp/gboot_non_root_'id -u1`/initrd_mnt \ |
|
|
# /tmp/gboot_non_root_'id -u1`/initrd_mnt \ |
|
|
# auto defaults,noauto,user,loop 0 0 |
|
|
# auto defaults,noauto,user,loop 0 0 |
|
|
# |
|
|
# |
|
|
|
|
|
# |
|
|
|
|
|
# For genext2fs this is the only line required, this is so that lilo can |
|
|
|
|
|
# run. |
|
|
|
|
|
# |
|
|
# /dev/fd0 /tmp/gboot_not_root_mnt_`id -u` auto defaults,noauto,user 0 0 |
|
|
# /dev/fd0 /tmp/gboot_not_root_mnt_`id -u` auto defaults,noauto,user 0 0 |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2836,7 +2840,6 @@ sub lilo_put_it_together { |
|
|
if ( $fs_type eq "genext2fs" ) { |
|
|
if ( $fs_type eq "genext2fs" ) { |
|
|
|
|
|
|
|
|
my $error; |
|
|
my $error; |
|
|
=pod |
|
|
|
|
|
# |
|
|
# |
|
|
if ( |
|
|
if ( |
|
|
sys("/usr/lib/bootroot/$main::makefs -b $device_size -d $mnt -D $device_table $entry_advanced[0]") !~ |
|
|
sys("/usr/lib/bootroot/$main::makefs -b $device_size -d $mnt -D $device_table $entry_advanced[0]") !~ |
|
@ -2844,7 +2847,6 @@ sub lilo_put_it_together { |
|
|
$error = error("Cannot $fs_type filesystem.\n"); |
|
|
$error = error("Cannot $fs_type filesystem.\n"); |
|
|
return "ERROR" if $error && $error eq "ERROR"; |
|
|
return "ERROR" if $error && $error eq "ERROR"; |
|
|
} |
|
|
} |
|
|
=cut |
|
|
|
|
|
# |
|
|
# |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -2877,7 +2879,6 @@ sub lilo_put_it_together { |
|
|
# This enforces that lilo is only ran on a bootable drive, |
|
|
# This enforces that lilo is only ran on a bootable drive, |
|
|
# otherwise the user has to do it manually. |
|
|
# otherwise the user has to do it manually. |
|
|
if ($container[BOOT_DEVICE] eq $entry_advanced[0]) { |
|
|
if ($container[BOOT_DEVICE] eq $entry_advanced[0]) { |
|
|
=pod |
|
|
|
|
|
# |
|
|
# |
|
|
if ( err_custom("lilo -v -C brlilo.conf -r $mnt", |
|
|
if ( err_custom("lilo -v -C brlilo.conf -r $mnt", |
|
|
"gBootRoot: ERROR: lilo failed") == 2 ) { |
|
|
"gBootRoot: ERROR: lilo failed") == 2 ) { |
|
@ -2885,7 +2886,6 @@ sub lilo_put_it_together { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
# |
|
|
# |
|
|
=cut |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|