Updated references to sarge.

diff --git a/usr/share/carnet-upgrade/actions/apt.queue b/usr/share/carnet-upgrade/actions/apt.queue
index 39f9149..2ebce74 100644 (file)
--- a/usr/share/carnet-upgrade/actions/apt.queue
+++ b/usr/share/carnet-upgrade/actions/apt.queue
@@ -3,4 +3,4 @@
 # Konfiguracija apt-a
 ! pkg apt-cn                   pkgadd apt-cn           # 2.1.6
 pkg apt-cn lt 2.1.1            pkgadd apt-cn           # 2.1.6
-pkg apt-cn ge 2.1.1            sarge_sources_list      # 2.1.7 update
+pkg apt-cn ge 2.1.1            sources_list            # 2.1.7 update

diff --git a/usr/share/carnet-upgrade/actions/new.queue b/usr/share/carnet-upgrade/actions/new.queue
index 1e948aa..29a65f3 100644 (file)
--- a/usr/share/carnet-upgrade/actions/new.queue
+++ b/usr/share/carnet-upgrade/actions/new.queue
@@ -9,7 +9,7 @@ pkg carnet-tools-cn lt 2.3.1    pkgadd carnet-tools-cn          # 2.1.6
 pkg sendmail-cn ge 2:8.13.1-2  fix_smtp_auth
 pkg ntp-cn lt 2:4.2.0a-11      pkgadd ntp-cn                   # 2.1.4
 pkg apt-cn lt 2.1.1            pkgadd apt-cn                   # 2.1.6
-pkg apt-cn ge 2.1.1            sarge_sources_list              # 2.1.7 update
+pkg apt-cn ge 2.1.1            sources_list                    # 2.1.7 update
 pkg freeradius ge 2:0 && [ `dpkg --print-architecture` = sparc ] && \
   ! pkg freeradius-cn          install_freeradius              # 2.1.7
 pkg php4-cn lt 4:4.3.11-1      pkgadd php4-cn                  # 2.1.6 update

diff --git a/usr/share/carnet-upgrade/actions/post_upgrade.queue b/usr/share/carnet-upgrade/actions/post_upgrade.queue
index d99a71c..d0d4b9a 100644 (file)
--- a/usr/share/carnet-upgrade/actions/post_upgrade.queue
+++ b/usr/share/carnet-upgrade/actions/post_upgrade.queue
@@ -2,7 +2,7 @@
 # Ivan 'ico' Rako <irako@srce.hr>
 # Zoran Dzelajlija <jelly@srce.hr>
 #
-# samo akcije za nakon upgradea, moze se slobodno izvrsiti na bilo kojem sargeu.
+# samo akcije za nakon upgradea, moze se slobodno izvrsiti na bilo kojem etchu.
 #
 # s obzirom da ne znamo koja verzija paketa je radila upgrade, i ovdje treba
 # dodavati naknadne instalacije/upgrade paketa koje mozda nisu upgradeane sa

diff --git a/usr/share/carnet-upgrade/actions/sarge.queue b/usr/share/carnet-upgrade/actions/upgrade.queue
similarity index 92%
rename from usr/share/carnet-upgrade/actions/sarge.queue
rename to usr/share/carnet-upgrade/actions/upgrade.queue
index 449b80d..b3d778b 100644 (file)
--- a/usr/share/carnet-upgrade/actions/sarge.queue
+++ b/usr/share/carnet-upgrade/actions/upgrade.queue
@@ -2,7 +2,7 @@
 # Ivan 'ico' Rako <irako@srce.hr>
 # Zoran Dzelajlija <jelly@srce.hr>
 #
-# akcije za update sarge instalacije, slicno post_upgrade
+# akcije za update etch instalacije, slicno post_upgrade
 # veci broj paketa koji se ne daju upgradeati s obicnim
 # apt-get upgrade se forsirano upgradea
 true                           check_services preupgrade       # spremi stanje
@@ -11,7 +11,7 @@ pkg getunix-cn                        pkgrm getunix-cn
 ! debconf_priority check       debconf_priority set            # utisaj debconf
 ! pkg apt-cn                   pkgadd apt-cn                   # 2.1.6
 pkg apt-cn lt 2.1.1            pkgadd apt-cn                   # 2.1.6
-pkg apt-cn ge 2.1.1            sarge_sources_list              # 2.1.7 update
+pkg apt-cn ge 2.1.1            sources_list                    # 2.1.7 update
 pkg freeradius ge 2:0 && [ `dpkg --print-architecture` = sparc ] && \
   ! pkg freeradius-cn          install_freeradius              # 2.1.7
 pkg freeradius-cn lt 2:1.0.1-2 install_freeradius              # forsirane verzije # fix 2.1.4

diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index 7fb574e..4388ae6 100644 (file)
--- a/usr/share/carnet-upgrade/functions.sh
+++ b/usr/share/carnet-upgrade/functions.sh
@@ -261,7 +261,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian Sarge potrebno je napraviti upgrade ovih paketa:
+Prije prelaska na Debian Etch potrebno je napraviti upgrade ovih paketa:
   $upgrade
 
 Pokrenite:
@@ -519,10 +519,10 @@ fix_smtp_auth() {
   /etc/init.d/sendmail reload || true
 }
 
-sarge_sources_list() {
-  if [ ! -e /var/lib/carnet-upgrade/stamp-sarge_sources_list ]; then
+sources_list() {
+  if [ ! -e /var/lib/carnet-upgrade/stamp-sources_list ]; then
     install-carnet-sources.list
     apt-get -y update
-    touch /var/lib/carnet-upgrade/stamp-sarge_sources_list
+    touch /var/lib/carnet-upgrade/stamp-sources_list
   fi
 }

diff --git a/usr/share/carnet-upgrade/messages.sh b/usr/share/carnet-upgrade/messages.sh
index 7621d61..0825943 100644 (file)
--- a/usr/share/carnet-upgrade/messages.sh
+++ b/usr/share/carnet-upgrade/messages.sh
@@ -3,14 +3,14 @@
 title="CARNet upgrade Sarge->Etch"
 
 msg_first_warning="PAZNJA! PAZNJA!
-Pokrenuli ste proceduru nadogradnje CARNet Linux distribucije.\
- Prije nastavka, podsjecamo Vas da prije ove skripte svakako pokrenete\
- 'apt-get dist-upgrade', ukoliko vec niste. Takodjer strogo preporucujemo\
- napraviti backup cijelog sustava, s posebnim naglaskom na instalirane\
- baze podataka poput MySQL i PostgreSQL.
+Pokrenuli ste proceduru nadogradnje CARNet Linux distribucije.
+Prije nastavka, podsjecamo Vas da prije ove skripte svakako pokrenete
+'apt-get dist-upgrade', ukoliko vec niste. Takodjer strogo preporucujemo
+napraviti backup cijelog sustava, s posebnim naglaskom na instalirane
+baze podataka poput MySQL i PostgreSQL.
 
 Takodjer je potrebno procitati dokumentaciju za ovu nadogradnju koja se\
- nalazi u ovom paketu u:
+nalazi u ovom paketu u:
  /usr/share/doc/carnet-upgrade/carnet-upgrade.pdf.
 
 Zelite li nastaviti?"
@@ -36,12 +36,12 @@ msg_failed_services="Skripta nije uspjela detektirati da sljedeci servisi rade i
 
 "
 
-msg_finished="Automatizirani dio upgradea je zavrsen. Sada morate provjeriti\
+msg_finished_upgrade="Automatizirani dio upgradea je zavrsen. Sada morate provjeriti\
  jesu li svi vasi kriticni servisi ispravno konfigurirani i pokrenuti.
 
 "
 
-msg_finished_sarge="Automatizirane ispravke su izvrsene. Provjerite\
+msg_finished="Automatizirane ispravke su izvrsene. Provjerite\
  jesu li svi vasi kriticni servisi ispravno konfigurirani i pokrenuti.
 
 "

diff --git a/usr/share/carnet-upgrade/scripts/check_services b/usr/share/carnet-upgrade/scripts/check_services
index f314588..7677ffc 100755 (executable)
--- a/usr/share/carnet-upgrade/scripts/check_services
+++ b/usr/share/carnet-upgrade/scripts/check_services
@@ -36,7 +36,7 @@ cs_postupgrade () {
   local services i failed_services msg_header
 
   case "$queuename" in
-    sarge) msg_header="$msg_finished_sarge"
+    upgrade) msg_header="$msg_finished_upgrade"
       ;;
     *)
       msg_header="$msg_finished"
@@ -85,7 +85,7 @@ postupgrade)  cs_postupgrade
         ;;
 check) cs_check
         ;;
-*)     echo "Usage: $0 (preupgrade|postupgrade|postupgrade-sarge|check)"
+*)     echo "Usage: $0 (preupgrade|postupgrade|check)"
         exit 1 
         ;;
 esac