summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-08-29 14:56:36 +0000
committerdamien <damien@mandriva.com>2000-08-29 14:56:36 +0000
commit8cd7a99479c471b150c86fb09b64520e483f87c1 (patch)
tree6cd053110deed9d54ed1de7bae2117307903d62e
parent521d3d163039146edbc002f1daa99d8fcc4892a1 (diff)
downloaddrakx-8cd7a99479c471b150c86fb09b64520e483f87c1.tar
drakx-8cd7a99479c471b150c86fb09b64520e483f87c1.tar.gz
drakx-8cd7a99479c471b150c86fb09b64520e483f87c1.tar.bz2
drakx-8cd7a99479c471b150c86fb09b64520e483f87c1.tar.xz
drakx-8cd7a99479c471b150c86fb09b64520e483f87c1.zip
draknet integration
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/Makefile.drakxtools1
-rw-r--r--perl-install/install_steps_interactive.pm12
-rwxr-xr-xperl-install/standalone/draknet4
4 files changed, 9 insertions, 10 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 31ea28182..c79e11d74 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -16,7 +16,7 @@ tar-drakxtools: clean
$(MAKE) -C ../tools clean
cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/serial_probe drakxtools
cd ../drakxtools ; rm -rf install* pkgs.pm ftp.pm t.pm */CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* .
- cd .. ; tar cfI drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config share/MonitorsDB share/Cards+ share/CardsNames Newt c ddcprobe serial_probe share/po pci_probing sbus_probing resize_fat share/diskdrake.rc share/isdndb.net $(STANDALONEPMS) icons *.pm)
+ cd .. ; tar cfI drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config share/MonitorsDB share/Cards+ share/CardsNames Newt c ddcprobe serial_probe share/po pci_probing sbus_probing resize_fat share/diskdrake.rc share/isdndb.net share/makedev.sh $(STANDALONEPMS) icons *.pm)
cd .. ; rm -rf drakxtools
$(DIRS):
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 313570d64..b3220850a 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -30,6 +30,7 @@ install:
for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done
install -m 644 share/isdndb.net $(SYSCONFNETDEST)/isdn_db.txt
+ install -m 744 share/makedev.sh $(SYSCONFNETDEST)
install -m 644 share/{MonitorsDB,CardsNames,Cards+} $(LIBX11DEST)
install -m 644 share/diskdrake.rc $(ETCDEST)
install -m 644 share/po/*.po $(LIBDEST)/po
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 83155dffa..3b2e7fcda 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -511,14 +511,12 @@ such as ``mybox.mylab.myco.com''."),
}
install_steps::configureNetwork($o);
- #- added ppp configuration after ethernet one.
- if (!$::beginner && $o->ask_yesorno([ _("Modem Configuration") ],
- _("Do you want to configure a dialup connection with modem for your system?"), 0)) {
- $o->pppConfig;
+ #- added internet configuration after ethernet one.
+ if ($o->ask_yesorno([ _("Internet Configuration") ],
+ _("Do you want to configure an internet connection ?"), 0)) {
+ $o->{netcnx} ||= {};
+ netconnect::intro($o->{prefix}, $o->{netcnx}, $o, bool($o->{pcmcia})); #-dam's
}
- #- (dam's)
- $o->{netcnx} ||= {};
- netconnect::intro($o->{prefix}, $o->{netcnx}, $o, bool($o->{pcmcia}));
}
sub configureNetworkIntf {
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 8c4746fd0..eded05e8f 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-use lib qw (/usr/lib/libDrakX);
+use lib qw (..); # (/usr/lib/libDrakX);
use interactive;
use netconnect;
@@ -46,6 +46,6 @@ $::isStandalone = 1;
my $in = vnew interactive('su');
-netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia");
+netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia", sub { system("urpmi --auto XFree86-$_[0]") });
$in->exit(0);