distro/rpm: add manual update for opensuse

diff --git a/distro/deb/knot-resolver.postinst b/distro/deb/knot-resolver.postinst
index 675c06590186067b83ff9989f8fd0e93617d5979..923ab0378635dd1d084e658388e113b39ae2f3fa 100644 (file)
--- a/distro/deb/knot-resolver.postinst
+++ b/distro/deb/knot-resolver.postinst
@@ -5,9 +5,9 @@ set -e
 export UPG_DIR=/etc/knot-resolver/.upgrade-4-to-5
 if [ -d ${UPG_DIR} ] ; then
        kresd -c /usr/lib/knot-resolver/upgrade-4-to-5.lua >/dev/null 2>/dev/null
-       echo -e "   !!! WARNING !!!\n"
-       echo -e "Knot Resolver configuration file was automatically upgraded.\n"
-       echo -e "Verify changes manually in /etc/knot-resolver/kresd.conf\n"
+       echo "\n   !!! WARNING !!!"
+       echo "Knot Resolver configuration file was automatically upgraded."
+       echo "Verify changes manually in /etc/knot-resolver/kresd.conf\n"
        mv ${UPG_DIR} ${UPG_DIR}.bak
 fi
 

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 979990da32d692e70de4e09be898059caeb3c41e..d72521d37bbf0e6c5b885fb6e68736e7dbbba673 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -203,6 +203,7 @@ mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
 getent group knot-resolver >/dev/null || groupadd -r knot-resolver
 getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysconfdir}/knot-resolver -s /sbin/nologin -c "Knot Resolver" knot-resolver
 
+%if "x%{?rhel}" == "x"
 # upgrade-4-to-5
 if [ -f %{_unitdir}/kresd.socket ] ; then
        export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
@@ -224,18 +225,30 @@ if [ -f %{_unitdir}/kresd.socket ] ; then
                fi
        done
 fi
+%endif
 
 
 %post
 # upgrade-4-to-5
+%if 0%{?fedora}
 export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
 if [ -d ${UPG_DIR} ] ; then
        kresd -c %{_libdir}/knot-resolver/upgrade-4-to-5.lua
-       echo -e "   !!! WARNING !!!\n"
-       echo -e "Knot Resolver configuration file was automatically upgraded.\n"
+       echo -e "\n   !!! WARNING !!!"
+       echo -e "Knot Resolver configuration file was automatically upgraded."
        echo -e "Verify changes manually in %{_sysconfdir}/knot-resolver/kresd.conf\n"
        mv ${UPG_DIR} ${UPG_DIR}.bak
 fi
+%endif
+%if 0%{?suse_version}
+export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
+if [ -d ${UPG_DIR} ] ; then
+       echo -e "\n   !!! WARNING !!!"
+       echo -e "Manual upgrade required, run:\n"
+       echo -e "kresd -c %{_libdir}/knot-resolver/upgrade-4-to-5.lua &>/dev/null && mv %{_sysconfdir}/knot-resolver/.upgrade-4-to-5{,.bak}"
+       echo -e "\nand verify changes manually in %{_sysconfdir}/knot-resolver/kresd.conf\n"
+fi
+%endif
 
 # in case service files are updated
 systemctl daemon-reload &>/dev/null ||: