From 33512d7f58fab6184ea1dc21930f1d00c0e382c8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 6 Dec 2000 21:51:26 +0000
Subject: adapt to the fact that RPM_INSTALL_LANG is obsoloted. Now rpm uses
 %_install_langs in /etc/rpm/macros

---
 perl-install/install2.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'perl-install/install2.pm')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d6e172911..c927e0ac1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -202,7 +202,10 @@ sub selectLanguage {
     $o->selectLanguage($_[1] == 1);
 
     addToBeDone {
-	lang::write($o->{prefix});
+	lang::write_langs($o->{prefix}, $o->{langs});
+    } 'formatPartitions' unless $::g_auto_install;
+    addToBeDone {
+	lang::write($o->{prefix}, $o->{lang});
 	keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
     } 'installPackages' unless $::g_auto_install;
 }
@@ -240,7 +243,10 @@ sub selectKeyboard {
 
     #- if we go back to the selectKeyboard, you must rewrite
     addToBeDone {
-	lang::write($o->{prefix});
+	lang::write_langs($o->{prefix}, $o->{langs});
+    } 'formatPartitions' unless $::g_auto_install;
+    addToBeDone {
+	lang::write($o->{prefix}, $o->{lang});
 	keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
     } 'installPackages' unless $::g_auto_install;
 }
@@ -279,7 +285,7 @@ sub formatPartitions {
     $o->formatMountPartitions($o->{fstab}) unless $::testing;
 
     mkdir "$o->{prefix}/$_", 0755 foreach 
-      qw(dev etc etc/profile.d etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
+      qw(dev etc etc/profile.d etc/rpm etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
 	home mnt tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi);
     mkdir "$o->{prefix}/$_", 0700 foreach qw(root root/tmp);
 
-- 
cgit v1.2.1