From 157fe13a76e798fa8af5f79c792c704a593f6c93 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 8 Aug 2001 18:26:31 +0000 Subject: add interactive_pkgs stuff --- perl-install/standalone/XFdrake | 4 ++-- perl-install/standalone/adduserdrake | 2 +- perl-install/standalone/drakgw | 5 ++++- perl-install/standalone/draknet | 10 +++++----- perl-install/standalone/drakproxy | 5 ++++- 5 files changed, 16 insertions(+), 10 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index d98dba20f..840e0f68e 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -47,7 +47,7 @@ my $in = interactive->vnew('su', 'X'); -r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf'); my $f = "/usr/X11R6/lib/X11/Cards"; -$in->standalone::pkgs_install('XFree86', 'XFree86-75dpi-fonts') if (! -e $f); +$in->do_pkgs->install('XFree86', 'XFree86-75dpi-fonts') if !-e $f; -e $f or die "install XFree86 first!\n"; `pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start") if !$i->{skiptest}; @@ -82,7 +82,7 @@ eval { $::isEmbedded and kill USR2, $::CCPID; Xconfigurator::main('', $i, $in, { allowFB => $::expert, - allowNVIDIA_rpms => $allowNVIDIA_rpms }, sub { $in->standalone::pkgs_install(@_) }); + allowNVIDIA_rpms => $allowNVIDIA_rpms }); !$::isEmbedded and $in->exit(0); kill USR1, $::CCPID; goto begin; diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index 8584aa4ae..e8c98929a 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -36,7 +36,7 @@ any::addUsers('', $users); any::write_passwd_user('', $_, $isMD5) foreach @$users; system("pwconv") if $isShadow; -#$in->pkgs_install("autologin") if $o->{autologin}; +#$in->do_pkgs->install("autologin") if $o->{autologin}; #any::set_autologin('', $o->{autologin}, $o->{desktop}); $in->exit(0) if $in; diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index d4b7136b9..3a9632fec 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -304,7 +304,7 @@ my %rpm2file = ( ipchains => "/sbin/ipchains", bind => "/usr/sbin/named", "caching-nameserver" => "/var/named/named.local"); -$in->standalone::pkgs_install(grep { !-e $rpm2file{$_} } keys %rpm2file); +$in->do_pkgs->install(grep { !-e $rpm2file{$_} } keys %rpm2file); -e $rpm2file{$_} or fatal_quit(_("Problems installing package $_")) foreach keys %rpm2file; @@ -657,6 +657,9 @@ Click on Configure to launch the setup wizard.", $setup_state)); #------------------------------------------------- #- $Log$ +#- Revision 1.47 2001/08/08 18:26:31 prigaux +#- add interactive_pkgs stuff +#- #- Revision 1.46 2001/08/06 13:11:35 yduret #- use MDK::Common; #- use network::netconnect; and update functions call from netconnect diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index 8ec55a712..f61f7f822 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -279,7 +279,7 @@ my $button_wizard = new Gtk::Button _("Configure"); $button_wizard->signal_connect( clicked => sub { $::isWizard = 1; system("draknet --wizard"); -# netconnect::intro('', $netcnx, $in, sub { $in->standalone::pkgs_install(@_) }); +# netconnect::intro('', $netcnx, $in); $combo1->entry->set_text((-e "/etc/sysconfig/network-scripts/draknet_conf." . $combo1->entry->get_text) ? $combo1->entry->get_text : "default"); network::netconnect::load_conf($netcnx, $netc, $intf); update(); @@ -349,7 +349,7 @@ Gtk->main; Gtk->exit(0); dd: -network::netconnect::intro('', $netcnx, $in, sub { $in->standalone::pkgs_install(@_) }); +network::netconnect::intro('', $netcnx, $in); $in->exit(0); @@ -357,13 +357,13 @@ sub apply { $old_profile=$netcnx->{PROFILE} ? $netcnx->{PROFILE} : "default"; network::netconnect::save_conf($netcnx, $netc, $intf); - $netcnx->{type} eq 'modem' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '', sub { $in->standalone::pkgs_install(@_) }); + $netcnx->{type} eq 'modem' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, ''); $netcnx->{type} eq 'isdn_internal' and network::isdn::isdn_write_config_backend($netcnx->{$netcnx->{type}}, 1, $netc); #$light - $netcnx->{type} eq 'isdn_external' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '', sub { $in->standalone::pkgs_install(@_) }); + $netcnx->{type} eq 'isdn_external' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, ''); $netcnx->{type} eq 'adsl_ppoe' and adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pppoe'); $netcnx->{type} eq 'adsl_pptp' and adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pptp');; - network::configureNetwork2($in, $prefix, $netc, $intf, sub { $in->standalone::pkgs_install(@_) }); + network::configureNetwork2($in, $prefix, $netc, $intf); $netcnx->{type} =~ /adsl/ or system("/sbin/chkconfig --del adsl 2> /dev/null"); system("$prefix/etc/rc.d/init.d/network restart"); $button_apply->set_sensitive(0); diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index 6a10e9a41..66307e460 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -35,7 +35,7 @@ $::Wizard_title = _("Proxy handling"); my $in = interactive::vnew('su', 'default'); if ($::isWizard || ($::isEmbedded && ref($in) =~ /gtk/)) { - proxy::main('', $in, sub { $in->standalone::pkgs_install(@_) }); + proxy::main('', $in); $in->exit(0); } @@ -67,6 +67,9 @@ Gtk->exit(0); #------------------------------------------------- #- $Log$ +#- Revision 1.6 2001/08/08 18:26:31 prigaux +#- add interactive_pkgs stuff +#- #- Revision 1.5 2001/06/12 12:45:57 odin #- ui for drakproxy almost done #- -- cgit v1.2.1