diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-09-25 17:33:57 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-09-25 17:33:57 +0000 |
| commit | 80e027c030f66e961d15bd8f2a6d6e57b5363625 (patch) | |
| tree | 52e1ca7676e93fc6ecfd852dd8d092c27fd62466 | |
| parent | 07cfbe49efa16539739dbb312ebe81ab2c81b87d (diff) | |
| download | drakx-backup-do-not-use-80e027c030f66e961d15bd8f2a6d6e57b5363625.tar drakx-backup-do-not-use-80e027c030f66e961d15bd8f2a6d6e57b5363625.tar.gz drakx-backup-do-not-use-80e027c030f66e961d15bd8f2a6d6e57b5363625.tar.bz2 drakx-backup-do-not-use-80e027c030f66e961d15bd8f2a6d6e57b5363625.tar.xz drakx-backup-do-not-use-80e027c030f66e961d15bd8f2a6d6e57b5363625.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/ChangeLog | 3 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 3 | ||||
| -rw-r--r-- | perl-install/printer.pm | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 982575f19..351974ae1 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -2,6 +2,8 @@ * fs.pm: updated for live upgrade. * install2.pm: dropped unuseful steps filtering. + * install_any.pm: fixed wrong Device3Dfx package name and clean + postinstall rpms directory on upgrade before filling it. * install_gtk.pm: removed window restrictions of live upgrade. * install_steps.pm: fixed initrd symlink following in case of upgrade. @@ -10,6 +12,7 @@ * modules.pm: may fixed pcmcia lost driver (typically on network). * pkgs.pm: fixed (uggly?) usage of floating perl data on perl script :-) + * printer.pm: back to "Generic PostScript" for default printer (jloup). * printerdrake.pm: make sure an expert can choose among available devices. diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 7a6814d03..4fc28d345 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -32,7 +32,7 @@ use fs; XFree86-8514 XFree86-AGX XFree86-Mach32 XFree86-Mach64 XFree86-Mach8 XFree86-Mono XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128 XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs XFree86-FBDev XFree86-server -XFree86 XFree86-glide-module Device3DFX Glide_V3-DRI Glide_V5 Mesa +XFree86 XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa dhcpcd pump dhcpxd dhcp-client isdn4net isdn4k-utils dev pptp-adsl-fr rp-pppoe ppp ypbind rhs-printfilters lpr cups cups-drivers pnm2ppa Lexmark-1100-printer-driver__lm1100 samba ncpfs ); @@ -163,6 +163,7 @@ sub setup_postinstall_rpms($$) { require commands; log::l("postinstall rpms directory set to $postinstall_rpms"); + clean_postinstall_rpms(); #- make sure in case of previous upgrade problem. commands::mkdir_('-p', $postinstall_rpms); #- compute closure of unselected package that may be copied, diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 0abaf1a64..2688dc508 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -384,7 +384,7 @@ sub poll_ppd_base { scalar(keys %descr_to_ppd) > 5 or die "unable to connect to cups server"; #- assume a default printer not using any ppd at all. - $descr_to_ppd{"Raw queue (no filtering)"} = ''; + $descr_to_ppd{"Generic PostScript"} = ''; } #-****************************************************************************** |