bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 17:13:22 -05:00
Code Issues Projects Releases Wiki Activity

This fixes kernel_version_check to return a value.

Browse Source
This commit is contained in:
freesource 2001-10-03 05:10:03 +00:00
parent 794bf06372
commit 640ddbca30
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BootRoot/Yard.pm
View File

@ -91,7 +91,7 @@ sub logadj { $logadj = $_[0]; }
sub kernel_version_check { sub kernel_version_check {
my($kernel,$kernel_version) = @_; my($kernel,$kernel_version) = @_;
if (defined($kernel_version)) { if (defined($kernel_version)) {
# Check to see if it agrees # Check to see if it agrees
my($version_guess) = kernel_version($kernel); my($version_guess) = kernel_version($kernel);
@ -103,6 +103,7 @@ sub kernel_version_check {
"even though a probe says $version_guess.", "even though a probe says $version_guess.",
" I'll assume you're right.\n") " I'll assume you're right.\n")
} }
$ENV{'RELEASE'} = $kernel_version; $ENV{'RELEASE'} = $kernel_version;
} elsif (defined($ENV{'RELEASE'} = kernel_version($kernel))) { } elsif (defined($ENV{'RELEASE'} = kernel_version($kernel))) {
@ -122,6 +123,8 @@ sub kernel_version_check {
} }
} }
return $ENV{'RELEASE'} if $ENV{'RELEASE'};
} # end sub kernel_version_check } # end sub kernel_version_check
## This checks lib/modules/$version for rd.o, ext2.o, floppy.o ## This checks lib/modules/$version for rd.o, ext2.o, floppy.o
@ -1501,7 +1504,7 @@ sub kernel_version {
$str = unpack("S",$str); $str = unpack("S",$str);
#info (0, "Kernel setup header version is 0x"); #info (0, "Kernel setup header version is 0x");
# 2.4.0 kernels now use Start Text 0x202 # 2.4.0 kernels now use Start Text 0x202 - freesource
unless ($str == 0x201 unless ($str == 0x201
|| $str == 0x0202) { || $str == 0x0202) {
print sprintf("%04x",$str); print sprintf("%04x",$str);