}
dist_upgrade () {
+ log "Running upgrade ..."
+ apt-get -y$s upgrade || {
+ dpkg --configure -a
+ apt-get -y$s upgrade
+ }
+
log "Running dist-upgrade ..."
apt-get -y$s dist-upgrade || {
dpkg --configure -a
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
if [ "$upgrade" ]; then
notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa:
$upgrade
Pokrenite:
install_php5_extensions
notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju sa PHP 4 na PHP 5.
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju sa PHP 4 na PHP 5.
Pokrenite:
# apt-get update
if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
# kernel too old
notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel.
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju na najnoviji kernel.
Pokrenite:
# apt-get update
reboot_required () {
local default_kernel kernel_package running_release running_version
- # try to get default kernel from lilo
- if type lilo >/dev/null 2>&1; then
- default_kernel=$( lilo -t -v 2>/dev/null \
- | grep -B3 '[*]$' \
- | sed -n -e '/^Boot image: / { s///p; q; }' )
+ # try to get default kernel from grub2
+ if [ -z "$default_kernel" -a -r "/boot/grub/grub.cfg" ]; then
+ default_kernel=$( awk '
+ $0 ~ /^set default=".*"/ {
+ def = gensub(/default="(.*)"/, "\\1", "1", $2);
+ if (def !~ /^[0-9]+$/) { exit }
+ }
+ $1 == "menuentry" { menuentry+=1 }
+ $1 == "linux" && menuentry==def+1 { print $2; exit }' \
+ /boot/grub/grub.cfg 2>/dev/null )
fi
- # fallback to grub if lilo not installed
+ # try to get default kernel from grub-legacy
if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then
default_kernel=$( awk '
- $1 == "default" { default = $2;
- if (default !~ /^[0-9]+$/) { exit } }
+ $1 == "default" { def = $2;
+ if (def !~ /^[0-9]+$/) { exit } }
$1 == "title" { title+=1 }
- $1 == "kernel" && title==default+1 { print $2; exit }' \
+ $1 == "kernel" && title==def+1 { print $2; exit }' \
/boot/grub/menu.lst 2>/dev/null )
fi
+ # try to get default kernel from lilo
+ if [ -z "$default_kernel" ] && type lilo >/dev/null 2>&1; then
+ default_kernel=$( lilo -t -v 2>/dev/null \
+ | grep -B3 '[*]$' \
+ | sed -n -e '/^Boot image: / { s///p; q; }' )
+ fi
+
if [ -z "$default_kernel" ]; then
log "Could not find default kernel"
return 1
log "Default kernel image: $default_kernel"
if [ ! -e "$default_kernel" ]; then
- log "Default kernel image doesn't exist!?"
- return 1
+ # /boot prefix might be missing
+ default_kernel="/boot/${default_kernel#/}"
+ if [ ! -e "$default_kernel" ]; then
+ log "Default kernel image doesn't exist!?"
+ return 1
+ fi
fi
kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 )
return 1
esac
- pkgadd_if_installed $packages
+ pkgupgrade $packages
+}
+
+# install packages introduced in this release
+install_new () {
+ if [ "$new_packages" ]; then
+ pkgadd $new_packages
+ fi
}
# funkcija utrpa ispravan sources.list
# make a silent installation of carnet and srce keyrings
install_keyrings () {
pkgadd carnet-keyring srce-keyring debian-archive-keyring
- pkgadd_if_installed dpkg apt debconf python-apt dpkg-dev
+ pkgupgrade dpkg apt debconf python-apt dpkg-dev
dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
apt_update
}
# only upgrade packages if they are already installed
-pkgadd_if_installed () {
+pkgupgrade () {
local packages
packages=$( grep_installed $* )
# make a silent upgrade to new libc6
upgrade_libc () {
- DEBIAN_FRONTEND=noninteractive pkgadd_if_installed libc6 libc6-dev tzdata
+ DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
}
-# upgrade apache2/php5 to lenny
+# upgrade apache2/php5
upgrade_apache2 () {
pkgrm apache-common # prevents installation of apache2-suexec
- pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \
+ pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
php5-odbc php5-suhosin php-suhosin-cn
}
upgrade_amavis () {
local conf
- # remove init script diversion before upgrade
- if pkg amavisd-cn lt 3:2.6.1-1; then
- if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
- rm -vf /etc/init.d/amavis
- dpkg-divert --remove /etc/init.d/amavis
- fi
- fi
-
# move old config aside
for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
if [ -e $conf -a ! -e $conf.$backup_ext ]; then
# install new packages
pkgadd amavisd-cn amavisd-new
- # fix new packages
- check_and_sed '^clamd.*5.clamav.log$' \
- 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
- /etc/init.d/amavisd-cn || true
-
- # check if link got lost
- if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then
- apt-get install --reinstall --yes amavisd-cn
- fi
-
# start new packages
- /etc/init.d/amavis restart
+ /etc/init.d/amavisd-cn 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 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
-Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
+ if cmp /etc/issue $cnup/files/etc/issue.expect.new >/dev/null; then
+ cp -av /etc/issue /etc/issue.$backup_ext
+ cat > /etc/issue <<EOF
+Debian GNU/Linux 6.0 (CARNet Debian 6.0) \\n \\l
EOF
+ fi
- cat > /etc/issue.net <<EOF
-Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
+ if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.new >/dev/null; then
+ cp -av /etc/issue.net /etc/issue.net.$backup_ext
+ cat > /etc/issue.net <<EOF
+Debian GNU/Linux 6.0 (CARNet Debian 6.0) %h
EOF
+ fi
}
check_archives_space() {
}
check_kernel_space() {
- local available_disk_space kernel_size linux_images pkg ret
+ local available_disk_space kernel_size linux_images metapkg pkg ret
available_disk_space=$(free_space /)
linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \
- | grep -o 'linux-image[^ ]*')
- for pkg in $linux_images; do
+ | grep -o 'linux-image[^, ]*')
+ for metapkg in $linux_images; do
+ pkg=$(apt-cache show $metapkg | grep ^Depends: \
+ | grep -o 'linux-image[^, ]*' | head -1)
+ [ "$pkg" ] || continue
+
kernel_size=$(installed_size $pkg)
ret=$?
[ $ret -eq 0 ] && break
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
+}
projects / carnet-upgrade.git / blobdiff