X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=4620e8aad9dae98acf2dca2ed3127a2d05987ebc;hb=14762ba1a453a7d51c38d403b35055b1592e1376;hp=da07bc4ee129325c8b8011d4f4bbc7ba254a6a88;hpb=17a03476144e52e609b5ce79c4ebd16b488a6a6c;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index da07bc4..4620e8a 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -467,7 +467,7 @@ check_grsec_kernel () { return 0 fi - if [ "$ver" = "${ver#2.6.2[4-9]}" ] || reboot_required; then + if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then # kernel too old notice " Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel. @@ -483,6 +483,18 @@ Nakon toga ponovno pozovite ovu skriptu." fi } +check_reboot () { + reboot_required || return 0 + + LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$reboot_warning" 18 +75 + if [ $? -eq 0 ]; then + log "Reboot before continuing." + exit 0 + else + log "Proceed without reboot." + fi +} + # check if the latest kernel is booted reboot_required () { local default_kernel kernel_package running_release running_version