diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2010-02-04 15:07:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2010-02-04 15:07:36 +0000 |
| commit | befd6e9dc1cfe837f8b9f1956ed6a9bd0a92aaf5 (patch) | |
| tree | 7d433829a8e6c1ddbcd8639a1edbf98e9be2b5a1 | |
| parent | 2852057f5500444f6880edd92f05a343d2d6a531 (diff) | |
| download | drakx-befd6e9dc1cfe837f8b9f1956ed6a9bd0a92aaf5.tar drakx-befd6e9dc1cfe837f8b9f1956ed6a9bd0a92aaf5.tar.gz drakx-befd6e9dc1cfe837f8b9f1956ed6a9bd0a92aaf5.tar.bz2 drakx-befd6e9dc1cfe837f8b9f1956ed6a9bd0a92aaf5.tar.xz drakx-befd6e9dc1cfe837f8b9f1956ed6a9bd0a92aaf5.zip | |
(setupBootloader__general, read_grub_menu_lst, write_grub) default to
always crypt grub passwords
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 11 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
4 files changed, 5 insertions, 10 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b34faa205..2c8b8f1c2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -9,6 +9,7 @@ o TV: cx25821, saa7164 o wifi: r8187se, r8192_pci, r8192u_usb, rt2800pci, vt6655_stage, vt6656_stage - drakboot: + o default to always crypt grub passwords o fix support for crypted grub passwords Version 13.9 - 4 February 2010 diff --git a/perl-install/any.pm b/perl-install/any.pm index f8f81b60f..7c1673eae 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -428,8 +428,6 @@ sub setupBootloader__general { disabled => sub { !$enable_lapic } }, { text => N("Enable Local APIC"), val => \$enable_lapic, type => 'bool', advanced => 1 }, { label => N("Security"), title => 1 }, - { text => N("Encrypted password"), val => \$b->{encrypted}, type => "bool", - disabled => sub { $b->{method} !~ /^grub/ } }, { label => N("Password"), val => \$b->{password}, hidden => 1, validate => sub { my $ok = $b->{password} eq $b->{password2} diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index d56088216..5b2ac248c 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -338,7 +338,6 @@ sub read_grub_menu_lst { } if ($b{password} =~ /^--md5 (.*)/) { $b{password} = $1; - $b{encrypted} = 1; } #- sanitize @@ -1747,13 +1746,9 @@ sub write_grub { push @conf, $format->(grep { defined $bootloader->{$_} } qw(timeout)); push @conf, $format->(grep { $bootloader->{$_} } qw(color serial shade terminal viewport background foreground)); if (my $pw = $bootloader->{password}) { - if ($bootloader->{encrypted}) { - $pw = crypt_grub_password($pw) if !is_already_crypted($pw); - $bootloader->{'password --md5'} = $pw; - push @conf, $format->('password --md5'); - } else { - push @conf, $format->('password'); - } + $pw = crypt_grub_password($pw) if !is_already_crypted($pw); + $bootloader->{'password --md5'} = $pw; + push @conf, $format->('password --md5'); } push @conf, map { $_ . ' ' . $file2grub->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(gfxmenu); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a3b30c7e5..132cffa7b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -12,6 +12,7 @@ o add support for crypted grub passwords o always display security settings o allow timeout to be '0' + o default to always crypt grub passwords - partitioning wizard: o offer to install on dmraid (instead of crashing if no other disk) o offer to install on existing lvm |