X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=28d229ab8a033d9671311894cce684e3c03233e8;hb=193ec74d7968fd36d24a6254085379eee24e3b7d;hp=209bbe7cb3914558395974fa83f2355efd7d81a4;hpb=70be44f3d0125218858a2fba082307096c5baa11;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 209bbe7..28d229a 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -146,6 +146,12 @@ apt_download() { } 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 @@ -376,7 +382,7 @@ check_upgrade () { 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: @@ -455,7 +461,7 @@ check_php_version () { 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 @@ -507,7 +513,7 @@ check_grsec_kernel () { 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 @@ -536,23 +542,35 @@ check_reboot () { 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 @@ -561,8 +579,12 @@ reboot_required () { 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 ) @@ -600,7 +622,7 @@ upgrade () { return 1 esac - pkgadd_if_installed $packages + pkgupgrade $packages } # install packages introduced in this release @@ -931,7 +953,7 @@ apt_listchanges () { # 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 @@ -1009,7 +1031,7 @@ grep_installed () { } # only upgrade packages if they are already installed -pkgadd_if_installed () { +pkgupgrade () { local packages packages=$( grep_installed $* ) @@ -1021,27 +1043,19 @@ pkgadd_if_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 @@ -1052,18 +1066,8 @@ upgrade_amavis () { # 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 upgrade @@ -1072,7 +1076,7 @@ upgrade_freeradius () { pkg freeradius-aai lt 2.1.3-0lenny0 || return 0 - # aai team prevents a clean lenny upgrade + # aai team prevents a clean upgrade cp -av /etc/freeradius /etc/freeradius.$backup_ext pkgrm freeradius-aai freeradius-ldap freeradius pkgadd freeradius-aai @@ -1213,18 +1217,18 @@ comment_force_overwrite () { # try not to overwrite user modified issue files fix_issue () { - if cmp /etc/issue $cnup/files/etc/issue.expect.lenny >/dev/null; then + if cmp /etc/issue $cnup/files/etc/issue.expect.new >/dev/null; then cp -av /etc/issue /etc/issue.$backup_ext cat > /etc/issue </dev/null; then + 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 <