summaryrefslogtreecommitdiffstats
path: root/move
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-04-05 13:15:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-04-05 13:15:55 +0000
commit29e528b7b9aa3bc0daefee65034fef6560d7affa (patch)
treea6175a195116e075e9cd7124f4e8f762aa2d936a /move
parent4021e502ce287bab1116e8d60dc2b1a3edf49cae (diff)
downloaddrakx-29e528b7b9aa3bc0daefee65034fef6560d7affa.tar
drakx-29e528b7b9aa3bc0daefee65034fef6560d7affa.tar.gz
drakx-29e528b7b9aa3bc0daefee65034fef6560d7affa.tar.bz2
drakx-29e528b7b9aa3bc0daefee65034fef6560d7affa.tar.xz
drakx-29e528b7b9aa3bc0daefee65034fef6560d7affa.zip
adapt to kernel 2.6 (and fake having one so that pkg selection defaults to 2.6)
Diffstat (limited to 'move')
-rwxr-xr-xmove/make_live6
1 files changed, 5 insertions, 1 deletions
diff --git a/move/make_live b/move/make_live
index 39dfbb424..083bebe87 100755
--- a/move/make_live
+++ b/move/make_live
@@ -10,7 +10,7 @@ my @langs = map { /^../; $& } @ALLOWED_LANGS;
@ARGV <= 1 or die "usage: make_live [live_location=/tmp/live_tree]\n";
my $kernel_version = do {
- my @l = glob_('/export/Mandrake/RPMS/kernel-2.*');
+ my @l = glob_('/export/Mandrake/RPMS/kernel-2.6*');
@l >= 1 or die "can't find kernel";
@l <= 1 or die "too many kernels";
first(`rpm -qp --qf '%{name}' $l[0]` =~ /kernel-(.*)/);
@@ -35,6 +35,10 @@ sub installPackages {
open(my $F, '/export/' . install_any::relGetFile($f)) or return;
$F;
};
+
+ undef *c::kernel_version;
+ *c::kernel_version = sub { $kernel_version };
+
install_any::setPackages(my $o = $::o = {
prefix => $::prefix,
meta_class => 'desktop',