projects
/
carnet-upgrade.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
70ce021
)
Fix default kernel detection.
author
Valentin Vidic
<Valentin.Vidic@CARNet.hr>
Fri, 24 Apr 2009 12:34:59 +0000
(14:34 +0200)
committer
Valentin Vidic
<Valentin.Vidic@CARNet.hr>
Fri, 24 Apr 2009 12:34:59 +0000
(14:34 +0200)
src/functions.sh
patch
|
blob
|
history
diff --git
a/src/functions.sh
b/src/functions.sh
index
527742a
..
a8c9b4e
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-510,7
+510,7
@@
reboot_required () {
if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then
default_kernel=$( awk '
$1 == "default" { default = $2;
if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then
default_kernel=$( awk '
$1 == "default" { default = $2;
- if (default != /^[[:digit:]]+$/) { exit } }
+ if (default !~ /^[0-9]+$/) { exit } }
$1 == "title" { title+=1 }
$1 == "kernel" && title==default+1 { print $2; exit }' \
/boot/grub/menu.lst 2>/dev/null )
$1 == "title" { title+=1 }
$1 == "kernel" && title==default+1 { print $2; exit }' \
/boot/grub/menu.lst 2>/dev/null )
@@
-537,11
+537,6
@@
reboot_required () {
log "Default kernel package: $kernel_package"
log "Default kernel package: $kernel_package"
- if [ "$kernel_package" != "kernel-2.6-cn" ]; then
- log "Default kernel package is not kernel-2.6-cn"
- return 1
- fi
-
running_release=$( uname -r )
running_version=$( uname -v )
log "Running kernel: $running_release $running_version"
running_release=$( uname -r )
running_version=$( uname -v )
log "Running kernel: $running_release $running_version"