Fix reboot check.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index 26d4014..be41f84 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -146,6 +146,12 @@ apt_download() {
 }
 
 dist_upgrade () {
+  log "Running upgrade ..."
+  apt-get -y$s upgrade || {
+    dpkg --configure -a
+    apt-get -y$s upgrade
+  }
+
   log "Running dist-upgrade ..."
   apt-get -y$s dist-upgrade || {
     dpkg --configure -a
@@ -574,7 +580,7 @@ reboot_required () {
 
   if [ ! -e "$default_kernel" ]; then
       # /boot prefix might be missing
-      default_kernel="/boot/$default_kernel"
+      default_kernel="/boot/${default_kernel#/}"
       if [ ! -e "$default_kernel" ]; then
           log "Default kernel image doesn't exist!?"
           return 1