summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-28 10:44:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-28 10:44:05 +0000
commit17695dd46355c86621858a4756d6f8a0b07e222d (patch)
tree2d80f2ed285ace80ad913801715b9d852d6c33c1
parentee506b5b768b18490683ee6874659574408bdb81 (diff)
downloaddrakx-17695dd46355c86621858a4756d6f8a0b07e222d.tar
drakx-17695dd46355c86621858a4756d6f8a0b07e222d.tar.gz
drakx-17695dd46355c86621858a4756d6f8a0b07e222d.tar.bz2
drakx-17695dd46355c86621858a4756d6f8a0b07e222d.tar.xz
drakx-17695dd46355c86621858a4756d6f8a0b07e222d.zip
- add /etc/rpm/macros.cdb
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm2
-rw-r--r--perl-install/install/share/list.xml1
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f03f1bfdc..b79ffce68 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- add /etc/rpm/macros.cdb
+
Version 10.4.217 - 27 September 2007, by Thierry Vignaud
- help:
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 33b33a1c0..5bde50be0 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -5,7 +5,7 @@ use strict;
BEGIN {
# needed before "use URPM"
mkdir '/etc/rpm';
- symlink '/tmp/stage2/etc/rpm/platform', '/etc/rpm/platform';
+ symlink "/tmp/stage2/etc/rpm/$_", "/etc/rpm/$_" foreach 'platform', 'macros.cdb';
}
use URPM;
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 72f758c77..f9f9a89cb 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -117,6 +117,7 @@
/etc/fonts/fonts.conf
/etc/protocols
/etc/rpm/platform
+ /etc/rpm/macros.cdb
/LIB/udev/usb_id
/usr/LIB/xserver/SecurityPolicy
/etc/pango/ARCH/pango.modules