LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75
if [ $? -eq 0 ]; then
log "Removing X Window System"
- pkgrm xlibs
+ pkgrm x11-common
else
log "Skipping X Window System removal"
fi
/etc/init.d/amavis restart
}
-# handle freerdius config files upgrade
+# handle freerdius upgrade
upgrade_freeradius () {
local template config_new password realm hostname basedn
pkg freeradius-aai lt 2.1.3-0lenny0 || return 0
- # handle static configs
- restore_file /etc/freeradius/clients.conf
- restore_file /etc/freeradius/hints
- restore_file /etc/freeradius/ldap.attrmap
-
- # handle template based configs
- basedn=$(sed -n '/^[[:space:]]*suffix[[:space:]]*/ {
- s///; s/"//g; p; q }' /etc/ldap/slapd.conf)
- hostname=$(hostname -f)
- config_new=$(copy_template /etc/freeradius/radiusd.conf)
- sed -i "s/#HOSTNAME#/$hostname/" $config_new
- sed -i "s/#BASEDN#/$basedn/" $config_new
- restore_file /etc/freeradius/radiusd.conf $config_new
- rm -f $config_new
-
- password=$(grep -s '^[[:space:]]*private_key_password[[:space:]]*=' \
- /etc/freeradius/eap.conf)
- config_new=$(copy_template /etc/freeradius/eap.conf)
- sed -i "s/.*#PASSWORD#.*/$password/" $config_new
- restore_file /etc/freeradius/eap.conf $config_new
- rm -f $config_new
-
- realm=$(sed -n '/^[[:space:]]*suffix[[:space:]]*/ {
- s///; s/"//g; s/,dc=/./g; s/dc=//; s/.hr$//; p; q }' /etc/ldap/slapd.conf)
- config_new=$(copy_template /etc/freeradius/proxy.conf)
- sed -i "s/#REALM#/$realm/" $config_new
- restore_file /etc/freeradius/proxy.conf $config_new
- rm -f $config_new
-
- # install the new packages
- if ! apt-get -y install freeradius; then
- # freeradius upgrade fails here, try to fix it by creating certificates
- [ -x /etc/freeradius/certs/bootstrap ] && /etc/freeradius/certs/bootstrap
-
- dpkg --configure -a
- apt-get -y -f install
- fi
-
- # finally try to cleanup this mess
+ # aai team prevents a clean lenny upgrade
+ cp -av /etc/freeradius /etc/freeradius.$backup_ext
+ pkgrm freeradius-aai freeradius-ldap freeradius
pkgadd freeradius-aai
}
fi
}
+# upgrade bind separately so DNS is not down for too long
+# or breaks postinst scripts of other cn packages that depend on
+# working resolver
+upgrade_bind() {
+ pkgadd bind9-cn
+}
+
get_variable () {
local name=$1 file=$2 val
fi
}
+# try not to overwrite user modified issue files
fix_issue () {
- cat > /etc/issue <<EOF
+ if cmp /etc/issue $cnup/files/etc/issue.expect.lenny >/dev/null; then
+ cp -av /etc/issue /etc/issue.$backup_ext
+ cat > /etc/issue <<EOF
Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
EOF
+ fi
- cat > /etc/issue.net <<EOF
+ if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.lenny >/dev/null; then
+ cp -av /etc/issue.net /etc/issue.net.$backup_ext
+ cat > /etc/issue.net <<EOF
Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
EOF
+ fi
}
check_archives_space() {
echo $num
}
+
+# make sure carnet-upgrade doesn't get upgraded until the end
+hold_carnet_upgrade() {
+ echo carnet-upgrade hold | dpkg --set-selections
+}
+
+release_carnet_upgrade() {
+ echo carnet-upgrade install | dpkg --set-selections
+}