diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2000-10-10 15:31:50 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-10-10 15:31:50 +0000 |
| commit | e3b3dcd7ac3acecc443ebf5de6d94a7499732e89 (patch) | |
| tree | 0f9d79c2b9e4d0e46fe8f882563960ed5e025f71 | |
| parent | 764dfa3cd8c0f8182a99c21d0d5eca32d493c0d3 (diff) | |
| download | drakx-backup-do-not-use-e3b3dcd7ac3acecc443ebf5de6d94a7499732e89.tar drakx-backup-do-not-use-e3b3dcd7ac3acecc443ebf5de6d94a7499732e89.tar.gz drakx-backup-do-not-use-e3b3dcd7ac3acecc443ebf5de6d94a7499732e89.tar.bz2 drakx-backup-do-not-use-e3b3dcd7ac3acecc443ebf5de6d94a7499732e89.tar.xz drakx-backup-do-not-use-e3b3dcd7ac3acecc443ebf5de6d94a7499732e89.zip | |
make only one call to urpmi in order to install all the needed rpm's
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/drakgw | 44 |
2 files changed, 26 insertions, 23 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index a09708b34..e4e1645ed 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,8 @@ +2000-10-10 Guillaume Cottenceau <gc@mandrakesoft.com> + + * standalone/drakgw: make only one call to urpmi in order + to install all the needed rpm's + 2000-10-10 DrakX <install@linux-mandrake.com> * snapshot uploaded diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index a1206db03..2dcdb2b10 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -299,11 +299,21 @@ EOF close IFCFG; -#- install and setup the FORWARD and MASQ stuff with IPCHAINS +#- install and setup the RPM packages -my $f = "/sbin/ipchains"; --e $f or install_rpm("ipchains"); --e $f or fatal_quit(_("Could not install ipchains RPM with urpmi.")); +my $rpms_to_install; +my %bin2rpm = ( "/sbin/ipchains" => "ipchains", + "/usr/sbin/dhcpd" => "dhcp", + $conf_linuxconf => "linuxconf", + "/usr/sbin/named" => "bind", + "/var/named/named.local" => "caching-nameserver" ); + +-e $_ or $rpms_to_install .= "$bin2rpm{$_} " foreach (keys %bin2rpm); +install_rpm($rpms_to_install); +-e $_ or fatal_quit(_("Problems installing package $bin2rpm{$_}")) foreach (keys %bin2rpm); + + +#- setup the masquerading configuration if (-f "/etc/rc.d/rc.firewall") { @@ -449,11 +459,7 @@ print SYSCONF_NETWORK @sysconf_network_content; close SYSCONF_NETWORK; -#- install and setup the DHCP server - -$f = "/usr/sbin/dhcpd"; --e $f or install_rpm("dhcp"); --e $f or fatal_quit(_("Could not install dhcp RPM with urpmi.")); +#- setup the DHCP server -f $dhcpd_conf and rename($dhcpd_conf, "$dhcpd_conf.old"); local *DHCPDCONF; open DHCPDCONF, ">$dhcpd_conf" or die "Can't open $dhcpd_conf"; @@ -476,9 +482,6 @@ close DHCPDCONF; #- put the interface for the dhcp server in linuxconf config, for the /etc script of dhcpd --f $conf_linuxconf or install_rpm("linuxconf"); --f $conf_linuxconf or fatal_quit(_("Could not install linuxconf RPM with urpmi.")); - open CONF_LINUXCONF, "$conf_linuxconf" or die "Can't open $conf_linuxconf"; my @conf_linuxconf_content = <CONF_LINUXCONF>; close CONF_LINUXCONF; @@ -489,17 +492,6 @@ print CONF_LINUXCONF @conf_linuxconf_content; close CONF_LINUXCONF; -#- install the BIND and caching nameserver stuff - -$f = "/usr/sbin/named"; --e $f or install_rpm("bind"); --e $f or fatal_quit(_("Could not install bind RPM with urpmi.")); - -$f = "/var/named/named.local"; --e $f or install_rpm("caching-nameserver"); --e $f or fatal_quit(_("Could not install caching-nameserver RPM with urpmi.")); - - #- start the daemons start_daemons(); @@ -518,3 +510,9 @@ log::l("[drakgw] Installation complete, exiting\n"); $in->exit(0); + +#------------------------------------------------- +#- $Log$ +#- Revision 1.16 2000/10/10 15:31:50 gc +#- make only one call to urpmi in order to install all the needed rpm's +#- |