X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=87927231a6c7d48186596117f8615faca6b1301b;hb=4c8eddead18619f440db0845fe0db10848942b89;hp=5fce053fcbe1fa8af0b1cc86a31d608bc6ccbadb;hpb=6f4f76a38153d21d9c8d3034f997d28d7f2fba83;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 5fce053..8792723 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -6,6 +6,7 @@ notice () {
 }
 
 first_warning () {
+  log "$version"
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75
   if [ $? -ne 0 ]; then
     log "Upgrade canceled."
@@ -340,6 +341,32 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# if grsec is installed make sure it is fresh
+check_grsec_kernel () {
+  local ver=`uname -r`
+
+  log "Kernel version: $ver"
+  if [ "$ver" = "${ver%-grsec}" ]; then
+    # not grsec variant
+    return 0
+  fi
+
+  if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
+    # kernel too old
+    notice "
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju na najnoviji grsec kernel.
+
+Pokrenite:
+  # apt-get update
+  # apt-get install kernel-2.6-cn
+  # reboot
+  
+Nakon toga ponovno pozovite ovu skriptu."
+    log "carnet-upgrade aborted, kernel upgrade needed."
+    exit 1
+  fi
+}
+
 upgrade () {
   local i to_install packages
   case "$1" in
@@ -879,8 +906,7 @@ free_space() {
 
 download_size() {
   local size
-  size=$(LC_ALL=C apt-get --yes --print-uris "$@" \
-         | grep '^Need to get ')
+  size=$(LC_ALL=C apt-get --yes --print-uris "$@" | grep '^Need to get ')
 
   if [ $? -ne 0 ]; then
     log "Failed to get download size for 'apt-get $@'."
@@ -896,8 +922,7 @@ download_size() {
 installed_size() {
   local package size
   package=$1
-  size=$(apt-cache show $package \
-         | grep '^Installed-Size:')
+  size=$(apt-cache show $package | grep '^Installed-Size:')
 
   if [ $? -ne 0 ]; then
     log "Failed to get installed size for '$package'."