updated isdn card

3 files changed, 7 insertions, 18 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 68f7ac515..36d7a7f0f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -220,7 +220,7 @@ _("Default") => { val => \$default, type => 'bool' },
 	    $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};
 	    require bootloader;
 	    bootloader::configure_entry($prefix, $e); #- hack to make sure initrd file are built.
-	    
+
 	    push @{$b->{entries}}, $e if $c eq "Add";
 	} else {
 	    @{$b->{entries}} = grep { $_ != $e } @{$b->{entries}};
@@ -231,7 +231,7 @@ _("Default") => { val => \$default, type => 'bool' },
 
 sub setAutologin {
   my ($prefix, $user, $wm) = @_; 
-  my $f = "$prefix/etc/X11/xdm/xdm_config";
+  my $f = "$prefix/etc/X11/xdm/xdm-config";
   my $t1 = "DisplayManager._0.autoUser:";
   my $t2 = "DisplayManager._0.autoString:";
   substInFile { s/^(\Q$t1\E|\Q$t2\E).*\n//; $_ .= "$t1\t$user\n$t2\t$wm\n" if eof && $user } $f;
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 072f770a1..31dfc3a16 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -17,7 +17,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 Xconfigurator;
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index d34342dec..9b6b9f892 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;
@@ -30,7 +30,7 @@ local $_ = join '', @ARGV;
 
 #/-h/ and die "usage: DrakFuck[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
 
-my $i = {};
+my $isdn = {};
 
 $::isStandalone = 1;
 #$::force_xf3 = /-xf3/;
@@ -45,19 +45,8 @@ $::isStandalone = 1;
 #-e $f or system("urpmi --auto XFree86 XFree86-75dpi-fonts");
 #-e $f or die "install XFree86 first!\n";
 
-my $in = vnew interactive;#('su');
+my $in = vnew interactive('su');
 
-#`pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start");
-
-#system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
-
-#Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres;
-#Xconfig::getinfo($i);
-
-#Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia", sub { system("urpmi --auto XFree86-$_[0]") });
-
-#netconnect::isdn_ask('', $i, $in, -e "/etc/pcmcia");
-netconnect::isdn_detect('', $i, $in, -e "/etc/pcmcia");
-#netconnect::isdn_write_config('', $i, $in, -e "/etc/pcmcia");
+netconnect::net_connect('', $isdn, $in, -e "/etc/pcmcia");
 
 $in->exit(0);