summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-05-12 18:01:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-05-12 18:01:58 +0000
commit3614e8ce05d7cdaa931dc7c2382ffb169b8223d7 (patch)
tree59af143ef9f39f79a8fba64416c485b8881ac8c2
parent4170c136c6d9bd3b86e2dd3b231c01dc298a6731 (diff)
downloaddrakx-backup-do-not-use-3614e8ce05d7cdaa931dc7c2382ffb169b8223d7.tar
drakx-backup-do-not-use-3614e8ce05d7cdaa931dc7c2382ffb169b8223d7.tar.gz
drakx-backup-do-not-use-3614e8ce05d7cdaa931dc7c2382ffb169b8223d7.tar.bz2
drakx-backup-do-not-use-3614e8ce05d7cdaa931dc7c2382ffb169b8223d7.tar.xz
drakx-backup-do-not-use-3614e8ce05d7cdaa931dc7c2382ffb169b8223d7.zip
- pass enough dummy parameters to fs::merge_info_from_fstab
- add empty prototypes to help perl_checker catch miss writeen func calls
-rwxr-xr-xperl-install/standalone/drakboot6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 363233c8f..c5e219a82 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -311,12 +311,12 @@ gtkflush();
$w->main;
$in->exit(0);
-sub lilo_choice {
+sub lilo_choice() {
my $bootloader = bootloader::read();
my ($all_hds) = fsedit::get_hds();
my $fstab = [ fsedit::get_all_fstab($all_hds) ];
- fs::merge_info_from_fstab($fstab);
+ fs::merge_info_from_fstab($fstab, '', 0, undef);
$::expert=1;
@@ -338,7 +338,7 @@ sub lilo_choice {
# launch autologin functions
#-------------------------------------------------------------
-sub updateAutologin {
+sub updateAutologin() {
my ($usern, $deskt) = ($user_combo->entry->get_text(), $desktop_combo->entry->get_text());
if ($auto_buttons[0]->get_active()) {
$in->do_pkgs->install('autologin') if $x_mode;