diff options
| -rw-r--r-- | perl-install/ChangeLog | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/XFdrake | 15 | ||||
| -rwxr-xr-x | perl-install/standalone/printerdrake | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index a781c9597..deb875c2d 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,9 @@ +2000-09-20 Guillaume Cottenceau <gc@mandrakesoft.com> + + * standalone/printerdrake: for urpmi, added `--best-output' and suspend/resume + + * standalone/XFdrake: for urpmi, added `--best-output' and suspend/resume + 2000-09-20 dam's <damien@mandrakesoft.com> * standalone/draknet: used new package install function. diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index a8b4d934f..88db4c23d 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -39,12 +39,12 @@ $::noauto = /-noauto/; $::testing = /-testing/; $i->{skiptest} = /-skiptest/; +my $in = interactive->vnew('su'); + my $f = "/usr/X11R6/lib/X11/Cards"; --e $f or system("urpmi --auto XFree86 XFree86-75dpi-fonts"); +if (!-e $f) { $in->suspend; system("urpmi --auto --best-output XFree86 XFree86-75dpi-fonts"); $in->resume; } -e $f or die "install XFree86 first!\n"; -my $in = interactive->vnew('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 @@ -52,7 +52,10 @@ 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 { my ($server, @l) = @_; - system("urpmi --auto XFree86-$server " . join(' ', @l)) }); - +Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia", + sub { my ($server, @l) = @_; + $in->suspend; + system("urpmi --auto --best-output XFree86-$server " . join(' ', @l)); + $in->resume; + }); $in->exit(0); diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index 14715e8e3..615f3c8d0 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -44,6 +44,6 @@ $printer->{mode} ||= 'cups'; #- assume this default if nothing found. my $in = vnew interactive('su'); -printerdrake::main(eval { printer::getinfo('') } || {}, $in, sub { my $l = join(' ', @_); `urpmi --auto $l` }); +printerdrake::main(eval { printer::getinfo('') } || {}, $in, sub { $in->suspend; system("urpmi --auto --best-output " . join(' ', @_)); $in->resume; }); $in->exit(0); |