projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename jessie -> stretch.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
780c3b8
..
4a5de69
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-367,7
+367,7
@@
check_upgrade () {
if [ "$upgrade" ]; then
notice "
if [ "$upgrade" ]; then
notice "
-Prije prelaska na Debian Wheezy potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian stretch potrebno je napraviti nadogradnju ovih paketa:
$upgrade
Pokrenite:
$upgrade
Pokrenite:
@@
-530,16
+530,18
@@
create_sources_list () {
# backup old version
if [ -f $sl -a ! -f $sl.$backup_ext ]; then
# backup old version
if [ -f $sl -a ! -f $sl.$backup_ext ]; then
- cp -av $sl $sl.$backup_ext
+ cp -v $sl $sl.$backup_ext
fi
# install new version
fi
# install new version
- cp -av $sl_new $sl
+ cp -v $sl_new $sl
notice "Novi sadrzaj datoteke /etc/apt/sources.list:
`cat /etc/apt/sources.list`"
fi
notice "Novi sadrzaj datoteke /etc/apt/sources.list:
`cat /etc/apt/sources.list`"
fi
+ # make sure permissions are correct
+ chmod 0644 $sl
rm $sl_new
}
rm $sl_new
}
@@
-744,6
+746,11
@@
restore_configs () {
fi
}
fi
}
+# load various debconf defaults
+debconf_preload () {
+ echo libc6 libraries/restart-without-asking boolean true | debconf-set-selections
+}
+
# temporary disable listchanges packages to reduce clutter during upgrade
apt_listchanges () {
local file command=$1
# temporary disable listchanges packages to reduce clutter during upgrade
apt_listchanges () {
local file command=$1
@@
-864,7
+871,6
@@
pkgupgrade () {
# upgrade apache2/php5
upgrade_apache2 () {
pkgrm apache-common # prevents installation of apache2-suexec
# upgrade apache2/php5
upgrade_apache2 () {
pkgrm apache-common # prevents installation of apache2-suexec
- pkgrm php5-suhosin # not available for wheezy
pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
php5-odbc mod-security-cn
}
pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
php5-odbc mod-security-cn
}
@@
-879,20
+885,31
@@
upgrade_amavis () {
fi
done
fi
done
+ # workaround for insserv complaining
+ if [ -x /sbin/insserv ]; then
+ if [ -r /etc/init.d/amavis.amavisd-new ]; then
+ /sbin/insserv amavis.amavisd-new
+ fi
+ fi
+
# install new packages
pkgadd amavisd-cn amavisd-new
# install new packages
pkgadd amavisd-cn amavisd-new
+ # workaround for insserv complaining
+ if [ -x /sbin/insserv ]; then
+ if [ -r /etc/init.d/amavis.amavisd-new ]; then
+ /sbin/insserv amavis.amavisd-new
+ fi
+ fi
+
# start new packages
# start new packages
- /etc/init.d/amavisd-cn restart
+ ### By zelja, nema vise amavisd-cn, vjerujemo systemd-u
+ ### /etc/init.d/amavisd-cn restart
+ /etc/init.d/amavis restart
}
# handle mysql 5.0 to 5.1 upgrade
upgrade_mysql () {
}
# handle mysql 5.0 to 5.1 upgrade
upgrade_mysql () {
- # libc6-dev prevents mysql upgrade
- if pkg libc6-dev; then
- pkgrm libc6-dev
- fi
-
if pkg mysql-server || pkg mysql-server-5.1; then
pkgadd mysql-server
dpkg -P mysql-server-5.1
if pkg mysql-server || pkg mysql-server-5.1; then
pkgadd mysql-server
dpkg -P mysql-server-5.1
@@
-1014,6
+1031,17
@@
get_variable () {
echo $val
}
echo $val
}
+# switch to rsyslog
+upgrade_syslog() {
+ # libc6-dev prevents upgrade
+ if pkg libc6-dev; then
+ pkgrm libc6-dev
+ fi
+
+ pkgadd rsyslog
+ dpkg -P sysklogd klogd
+}
+
# restore munin configs for silent upgrade
upgrade_munin () {
local config backup hostname domain
# restore munin configs for silent upgrade
upgrade_munin () {
local config backup hostname domain