Remove unused actions. Use new version in motd.

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

diff --git a/src/functions.sh b/src/functions.sh
index 9a89122..ac21431 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -325,9 +325,11 @@ add_group_proc () {
   if ! getent group proc > /dev/null; then
     groupadd -g 99 proc 
     log "groupadd -g 99 proc"
-    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ] && \
-       egrep -q 'OIDENT_GROUP.*proc' /etc/default/oidentd; then
-      /etc/init.d/oidentd restart || true
+
+    # update oidentd so it uses the proc group
+    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ];
+       check_and_sed 'OIDENT_GROUP.*proc' 's/\(OIDENT_GROUP\).*/\1=proc/' \
+            /etc/default/oident && /etc/init.d/oidentd restart
     fi
   fi
 }
@@ -505,11 +507,6 @@ upgrade_openldap () {
   dpkg --configure -a # try postinst again
 }
 
-# instaliraj zadnji freeradius; uvjeti u queue fileovima
-install_freeradius () {
-  pkgadd --force-yes freeradius-cn freeradius=1.0.5-0 freeradius-ldap=1.0.5-0
-}
-
 # tentatively remove obsolete option in xinetd.conf
 fix_xinetd_conf () {
   if [ -f /etc/xinetd.conf ]; then
@@ -558,11 +555,11 @@ fix_aidexfer_conf() {
 
 fix_issue () {
   cat > /etc/issue <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 3.0) \\n \\l
+Debian GNU/Linux 4.0 (CARNet Debian 4.0) \\n \\l
 EOF
 
   cat > /etc/issue.net <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 3.0) %h
+Debian GNU/Linux 4.0 (CARNet Debian 4.0) %h
 EOF
 }