From: Ivan Rako <Ivan.Rako@CARNet.hr>
Date: Tue, 30 Oct 2007 21:34:03 +0000 (+0000)
Subject: r6:
X-Git-Tag: debian/6.0.0~29
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=feee780663536b8e19ba08bb44dcbcd955bfcbda;p=carnet-debian.git

r6:
---

diff --git a/debian/templates b/debian/templates
index 7ab2b53..b7144b2 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,7 +1,8 @@
 Template: carnet-debian/packages
 Type: multiselect
-Choices: amavisd-cn, amavis-stats-cn, apache2-cn, apt-cn, bind9-cn, carnet-tools-cn, clamav-cn, dovecot-cn, jre-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, phpbb2-cn, pine-cn, postfix-cn, samba-cn, vsftpd-cn
+Choices: amavisd-cn, amavis-stats-cn, apt-cn, bind9-cn, carnet-tools-cn, clamav-cn, dovecot-cn, iptables-cn, jre-cn, kernel-2.6-cn, kernel-2.6-zaptel-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php5-cn, php5-eaccelerator-cn, phpbb2-cn, php-suhosin-cn, pine-cn, postfix-cn, proftpd-cn, samba-cn, spamassassin-cn, squirrelmail-change-pass-cn, squirrelmail-cn, vsftpd-cn, webalizer-cn, xinetd-cn
 Description: Koje pakete zelite?
  CARNet Debian donosi pakete za laksu konfiguraciju servisa na CARNetovom
  cvornom racunalu.
 
+
diff --git a/install-carnet-debian b/install-carnet-debian
index b51ea80..321310b 100644
--- a/install-carnet-debian
+++ b/install-carnet-debian
@@ -6,8 +6,10 @@ set -e
 
 db_get carnet-debian/packages || true
 packages="`echo $RET | tr -d ','`"
+db_stop || true
 
-db_go
-db_stop
-
-apt-get install $packages
+if [ -z "$packages" ]; then
+  echo "CN: No packages for install."
+else
+  apt-get install $packages
+fi