summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-02-17 19:34:26 +0000
committerOlivier Blin <oblin@mandriva.org>2006-02-17 19:34:26 +0000
commit6847941451db611feceb7d0f433fc653dede2fd7 (patch)
tree88a67909907aa331ce39d482e7b5901e2549b056 /tools
parent599303b6101b7064ae2428a6655af6646889af21 (diff)
downloaddrakx-6847941451db611feceb7d0f433fc653dede2fd7.tar
drakx-6847941451db611feceb7d0f433fc653dede2fd7.tar.gz
drakx-6847941451db611feceb7d0f433fc653dede2fd7.tar.bz2
drakx-6847941451db611feceb7d0f433fc653dede2fd7.tar.xz
drakx-6847941451db611feceb7d0f433fc653dede2fd7.zip
allow to use a local rpmsrate
Diffstat (limited to 'tools')
-rwxr-xr-xtools/draklive4
-rw-r--r--tools/drakx-in-chroot3
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/draklive b/tools/draklive
index 171ebea28..356e0ae78 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -441,7 +441,8 @@ sub install_system {
get_system_root($live),
if_($live->{system}{region}, '--langs', join(':', @{$live->{regions}{$live->{system}{region}}})),
if_($live->{system}{auto_install}, '--auto_install', abs_path($live->{system}{auto_install})),
- if_($live->{system}{patch_install}, '--defcfg', abs_path($live->{system}{patch_install})))
+ if_($live->{system}{patch_install}, '--defcfg', abs_path($live->{system}{patch_install})),
+ if_($live->{system}{rpmsrate}, '--rpmsrate', abs_path($live->{system}{rpmsrate})))
or die "unable to install system chroot";
#- remove urpmi media added by drakx-in-chroot, they're unusable
run_('chroot', get_system_root($live), 'urpmi.removemedia', '-a');
@@ -953,6 +954,7 @@ Here's a configuration sample:
kernel => '2.6.12-12mdk-i586-up-1GB',
auto_install => 'config/auto_inst.cfg.pl',
patch_install => 'config/patch-2006-live.pl',
+ rpmsrate => 'config/rpmsrate',
rpms => [
'rpms/unionfs-kernel-2.6.12-12mdk-i586-up-1GB-1.1.1.1.20051124.1mdk-1mdk.i586.rpm'
],
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 3d05ddf22..822076ed9 100644
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -12,6 +12,7 @@ my $LIVE_LOCATION_REL = 'install/stage2/live/';
my $CLP_LOCATION_REL = 'install/stage2/';
my $CLP_FILE_REL = $CLP_LOCATION_REL . 'mdkinst.clp';
my $AUTO_INSTALL_ROOTED = '/tmp/drakx-in-chroot.cfg.pl';
+my $RPMSRATE_ROOTED = '/tmp/rpmsrate';
@ARGV >= 2 or die "usage: drakx-in-chroot <repository> <dir to install to> [options]\n";
@@ -143,6 +144,8 @@ sub copy_auto_install_files() {
} elsif ($opt eq 'defcfg' && -f $_) {
$defcfg = $_;
$ARGV[$::i-1] = $ARGV[$::i] = undef;
+ } elsif ($opt eq 'rpmsrate' && -f $_) {
+ cp_f($_, $SLASH_LOCATION . $RPMSRATE_ROOTED);
}
undef $opt;
/^--?(.*)/ and $opt = $1;