Failed final message updated to be more descriptive.
authorshort <>
Mon, 6 Oct 2003 08:53:52 +0000 (08:53 +0000)
committershort <>
Mon, 6 Oct 2003 08:53:52 +0000 (08:53 +0000)
kernel/Linux/prepmod.in

index 5f67cb5..a458f2e 100755 (executable)
@@ -125,11 +125,14 @@ print STDERR "Running kernel version: $uname_r (base version $uname_r_base)\n" i
 my $moduledir="/lib/modules/$uname_r$uname_smp/kernel/fs/lufs";
 print STDERR "Destination module directory: $moduledir\n" if !$quiet;
 
-do { $kernel||=$_ if -d $_; } for ("/lib/modules/$uname_r/build");
-do { $kernel||=$_ if -d $_; } for ("/usr/src/kernel-headers-$uname_r");
-do { $kernel||=$_ if -d $_; } for ("/usr/src/linux-$uname_r");
-do { $kernel||=$_ if -d $_; } for ("/usr/src/linux-$uname_r_base");
-do { $kernel||=$_ if -d $_; } for ("/usr/src/linux");
+my @kernel_paths=(
+                               "/lib/modules/$uname_r/build",
+                               "/usr/src/kernel-headers-$uname_r",
+                               "/usr/src/linux-$uname_r",
+                               "/usr/src/linux-$uname_r_base",
+                               "/usr/src/linux",
+                               );
+do { $kernel||=$_ if -d $_; } for (@kernel_paths);
 if (!$kernel) {
        print STDERR "Failed to find kernel headers for $uname_r\n" if !$kernel && !$quiet;
        }
@@ -156,7 +159,13 @@ for (<$modbindir/*-$uname_r*/*.o>,<$modbindir/*-${uname_r_base}*/*.o>,<$modbindi
                        if _system "/bin/rm -rf $moduledir; /bin/mkdir -p $moduledir; /bin/ln -s $_ $moduledir/lufs.o";
        _pass 1;
        }
-confess "lufs module not loaded: Try running $basedir/prepmod to see more.";
+confess "lufs module not loaded: Try running $basedir/prepmod to see more." if $quiet;
+confess "Failed to prepare lufs.o module for your Linux kernel $uname_r.\n"
+               .($kernel ? "Detected Linux kernel sources \"$kernel\" do not appear to be valid.\n"
+                               : "No Linux kernel sources for your running kernel were found.\n")
+               ."Please install kernel-source-x.y.z.i386.rpm or kernel-headers_x.y.z_i386.deb.\n"
+               ."The following directory paths were search (first existing directory used):\n"
+               .join("",map("\t\t$_\n",@kernel_paths));
 
 
 sub build_gcc