From: Valentin Vidic <vvidic@carnet.hr>
Date: Fri, 28 Dec 2007 17:32:22 +0000 (+0100)
Subject: Reverted back to original debconf variable names.
X-Git-Tag: debian/4.0.1~84
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=ff5e20ed5e61d73f9dc1d406923b19ee0784ae1d;p=carnet-upgrade.git

Reverted back to original debconf variable names.
---

diff --git a/usr/share/carnet-upgrade/scripts/check_services b/usr/share/carnet-upgrade/scripts/check_services
index aa24d6f..ee5a9e6 100755
--- a/usr/share/carnet-upgrade/scripts/check_services
+++ b/usr/share/carnet-upgrade/scripts/check_services
@@ -26,7 +26,7 @@ cs_preupgrade () {
   done
 
   if [ -n "$services" ]; then
-    db_set cn3-upgrade/check-services "$services"
+    db_set cn-upgrade/check-services "$services"
     db_go || true
   fi
 }
@@ -62,7 +62,7 @@ cs_postupgrade () {
       ;;
   esac
 
-  db_get cn3-upgrade/check-services || true
+  db_get cn-upgrade/check-services || true
   services="${RET// /|}"
 
   failed_services=$(
@@ -81,7 +81,7 @@ cs_postupgrade () {
 
 # checkiraj da li je sto zapisano u debconf
 cs_check () {
-  db_get cn3-upgrade/check-services || true
+  db_get cn-upgrade/check-services || true
   debconf="$RET"
 
   if [ -n "$debconf" ]; then
diff --git a/usr/share/carnet-upgrade/scripts/debconf_priority b/usr/share/carnet-upgrade/scripts/debconf_priority
index 7b330c4..028b445 100755
--- a/usr/share/carnet-upgrade/scripts/debconf_priority
+++ b/usr/share/carnet-upgrade/scripts/debconf_priority
@@ -15,7 +15,7 @@ debconf_priority_preupgrade () {
   old_debconf="$RET"
 
   if [ -n "$old_debconf" ]; then
-    db_set cn3-upgrade/debconf-priority "$old_debconf"
+    db_set cn-upgrade/debconf-priority "$old_debconf"
   fi
 
   db_set debconf/priority high
@@ -27,12 +27,12 @@ debconf_priority_preupgrade () {
 debconf_priority_postupgrade () {
   local new_debconf
 
-  db_get cn3-upgrade/debconf-priority || true
+  db_get cn-upgrade/debconf-priority || true
   new_debconf="$RET"
 
   if [ -n "$new_debconf" ]; then
     db_set debconf/priority "$new_debconf"
-    db_set cn3-upgrade/debconf-priority ""
+    db_set cn-upgrade/debconf-priority ""
   fi
 
   db_go || true
@@ -40,7 +40,7 @@ debconf_priority_postupgrade () {
 
 # checkiraj
 debconf_priority_check () {
-  db_get cn3-upgrade/debconf-priority || true
+  db_get cn-upgrade/debconf-priority || true
   debconf="$RET"
 
   if [ -n "$debconf" ]; then