Browse Source

Fixes a bug with append not remembering state for non-root users, or where the

lilo.conf wasn't found.  Also properly handles the values for $append and
$entry_advanced[2].
master
freesource 23 years ago
parent
commit
1c3fe99928
  1. 22
      gbootroot

22
gbootroot

@ -552,7 +552,6 @@ else {
# /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
my $user = $>; my $user = $>;
if (!-d "$tmp1/gboot_non_root_" . $user) { if (!-d "$tmp1/gboot_non_root_" . $user) {
@ -1039,14 +1038,19 @@ sub advanced_boot_section {
""); "");
$ea3->set_text($entry_advanced[11]) if defined $entry_advanced[11]; $ea3->set_text($entry_advanced[11]) if defined $entry_advanced[11];
#_______________________________________ #_______________________________________
# Append Options # Append Options
label_advanced("append =",0,1,3,4,$table_advanced); label_advanced("append =",0,1,3,4,$table_advanced);
$ea4 = entry_advanced(1,3,3,4,2,$table_advanced); $ea4 = entry_advanced(1,3,3,4,2,$table_advanced);
my $append; (undef,undef,$append) = gdkbirdaao(); my $append; (undef,undef,$append) = gdkbirdaao();
$tooltips->set_tip( $ea4, "Add append options to brlilo.conf.", ""); $tooltips->set_tip( $ea4, "Add append options to brlilo.conf.", "");
$ea4->set_text($append) if defined $append; # this will only show append if real
$ea4->set_text($entry_advanced[2]) if defined $entry_advanced[2]; if (!defined $entry_advanced[2]) {
$ea4->set_text($append) if $append;
}
else {
$ea4->set_text($entry_advanced[2]) if $entry_advanced[2];
}
#_______________________________________ #_______________________________________
# Kernel Version # Kernel Version

Loading…
Cancel
Save