From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Thu, 6 Jul 2023 12:11:05 +0000 (+0200)
Subject: Dodano drugo upozorenje
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=8a2a6fa288b2d869896b989632059c11ce977e48;p=carnet-upgrade.git

Dodano drugo upozorenje
---

diff --git a/files/etc/apt/sources.list.template b/files/etc/apt/sources.list.template
index 2b59ab0..196bc20 100644
--- a/files/etc/apt/sources.list.template
+++ b/files/etc/apt/sources.list.template
@@ -1,17 +1,23 @@
 # See sources.list(5) for more information
-deb http://ftp.hr.debian.org/debian/ buster main contrib non-free
-deb http://ftp.hr.debian.org/debian/ buster-updates main contrib non-free
-deb http://security.debian.org/ buster/updates main contrib non-free
+deb http://ftp.hr.debian.org/debian/ bullseye main contrib non-free
+deb http://ftp.hr.debian.org/debian/ bullseye-updates main contrib non-free
+
+# Security
+deb http://deb.debian.org/debian-security/ bullseye-security main
+
+# Backports
+#deb http://ftp.hr.debian.org/debian/ bullseye-backports main contrib non-free
 
 # CARNet Debian Linux
-deb http://ftp.carnet.hr/carnet-debian/ carnet-buster main non-free
+deb http://ftp.carnet.hr/carnet-debian/ carnet-bullseye main non-free
 
 # SRCE AAI@EduHr
-deb http://ftp.srce.hr/srce-debian/ srce-buster main
+deb http://ftp.srce.hr/srce-debian/ srce-bullseye main
 
 # Uncomment if you want the "apt source" function to work
-#deb-src http://ftp.hr.debian.org/debian/ buster main contrib non-free
-#deb-src http://ftp.hr.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-buster main non-free
-#deb-src http://ftp.srce.hr/srce-debian/ srce-buster main
+#deb-src http://ftp.hr.debian.org/debian/ bullseye main contrib non-free
+#deb-src http://ftp.hr.debian.org/debian/ bullseye-updates main contrib non-free
+#deb-src http://deb.debian.org/debian-security/ bullseye-security main
+#deb-src http://ftp.hr.debian.org/debian/ bullseye-backports main contrib non-free
+#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-bullseye main non-free
+#deb-src http://ftp.srce.hr/srce-debian/ srce-bullseye main
diff --git a/src/actions/main.queue b/src/actions/main.queue
index efe0d64..0d64400 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,5 +1,6 @@
 # Full upgrade
 true				first_warning
+true				second_warning
 true				check_my_version
 true				hold_carnet_upgrade
 true				install_keyrings	# update current keys
diff --git a/src/functions.sh b/src/functions.sh
index f198f62..d7f2e20 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -19,6 +19,14 @@ first_warning () {
   fi
 }
 
+second_warning () {
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_second_warning" 18 75
+  if [ $? -ne 0 ]; then
+    log "Upgrade canceled."
+    exit 0
+  fi
+}
+
 pkg() {
   local version
   dpkg -l "$1" 2> /dev/null | egrep -q "^.i" || return 1
diff --git a/src/messages.sh b/src/messages.sh
index 12aa0d0..871a2c5 100644
--- a/src/messages.sh
+++ b/src/messages.sh
@@ -9,8 +9,12 @@ SKRIPTE OBRISAT CE SE SVI CARNETOVI PAKETI SA SUSTAVA!  MODIFIKACIJE KOJE \
 SU CN PAKETI NAPRAVILI CE OSTATI, A BUDUCE NADOGRADNJE CETE MOCI NAPRAVITI \
 PUTEM STANDARDNOG DEBIANOVOG MEHANIZMA ZA NADOGRADNJE.
 
-Podsjecamo vas da prije ove skripte pokrenete 'apt update && apt upgrade'. \ 
-Preporucujemo i backup cijelog sustava, s posebnim naglaskom na instalirane \ 
+Zelite li nastaviti?"
+
+msg_second_warning="
+
+Podsjecamo vas da prije ove skripte pokrenete 'apt update && apt upgrade'.  
+Preporucujemo i backup cijelog sustava, s posebnim naglaskom na instalirane  
 baze podataka poput MariaDB i PostgreSQL.
 
 Takodjer pazljivo procitajte dokumentaciju koja se nalazi na web adresi 
@@ -18,7 +22,7 @@ http://sysportal.carnet.hr/system/files/carnet-upgrade-bullseye.pdf
 
 Zelite li nastaviti?"
 
-reboot_warning="Na racunalu je pronadjenja verzija kernela novija od trenutno \
+reboot_warning="Na racunalu je pronadjena verzija kernela novija od trenutno \
 pokrenute. Prije pocetka nadogradnje paketa preporuceno je pokrenuti racunalo \
 s najnovijim dostupnim kernelom. Nakon toga ponovno pozovite ovu skriptu.