From 1c3fe99928939f32f118b63aa401dbb5d436463c Mon Sep 17 00:00:00 2001 From: freesource Date: Wed, 17 Oct 2001 20:50:41 +0000 Subject: [PATCH] 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]. --- gbootroot | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gbootroot b/gbootroot index 7361f8e..0372824 100755 --- a/gbootroot +++ b/gbootroot @@ -552,7 +552,6 @@ else { # /dev/fd0 /tmp/gboot_not_root_mnt_`id -u` auto defaults,noauto,user 0 0 - my $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]; - #_______________________________________ - # Append Options - label_advanced("append =",0,1,3,4,$table_advanced); - $ea4 = entry_advanced(1,3,3,4,2,$table_advanced); - my $append; (undef,undef,$append) = gdkbirdaao(); - $tooltips->set_tip( $ea4, "Add append options to brlilo.conf.", ""); - $ea4->set_text($append) if defined $append; - $ea4->set_text($entry_advanced[2]) if defined $entry_advanced[2]; + #_______________________________________ + # Append Options + label_advanced("append =",0,1,3,4,$table_advanced); + $ea4 = entry_advanced(1,3,3,4,2,$table_advanced); + my $append; (undef,undef,$append) = gdkbirdaao(); + $tooltips->set_tip( $ea4, "Add append options to brlilo.conf.", ""); + # this will only show append if real + if (!defined $entry_advanced[2]) { + $ea4->set_text($append) if $append; + } + else { + $ea4->set_text($entry_advanced[2]) if $entry_advanced[2]; + } #_______________________________________ # Kernel Version