projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check if machine needs a reboot.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
da07bc4
..
4620e8a
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-467,7
+467,7
@@
check_grsec_kernel () {
return 0
fi
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.
# 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
}
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
# check if the latest kernel is booted
reboot_required () {
local default_kernel kernel_package running_release running_version