From 29e528b7b9aa3bc0daefee65034fef6560d7affa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 5 Apr 2004 13:15:55 +0000
Subject: adapt to kernel 2.6 (and fake having one so that pkg selection
 defaults to 2.6)

---
 move/make_live | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'move')

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', 
-- 
cgit v1.2.1