Merge branch 'master' into next

diff --git a/lfs/haproxy b/lfs/haproxy
index da56f889d4cb0b5329913dafdc4dfe35c54d3664..51414d8b6ace254e72f798f9f8c8d716cb9935c0 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = ""
 

diff --git a/src/paks/haproxy/install.sh b/src/paks/haproxy/install.sh
index 45b2161b18c8157664d86611f14ba02663cf2024..8282acb283016bd3e73869d85fb215e7c4a5b1d6 100644 (file)
--- a/src/paks/haproxy/install.sh
+++ b/src/paks/haproxy/install.sh
@@ -23,6 +23,7 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+restore_backup ${NAME}
 
 # Enable autostart
 ln -sf  ../init.d/haproxy /etc/rc.d/rc0.d/K25haproxy

diff --git a/src/paks/haproxy/uninstall.sh b/src/paks/haproxy/uninstall.sh
index b01ee1147e9507c21db04b3c608b128b4a242657..9621b52a078f5b2247d28613db5f29b0210495c8 100644 (file)
--- a/src/paks/haproxy/uninstall.sh
+++ b/src/paks/haproxy/uninstall.sh
@@ -22,5 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+make_backup ${NAME}
 remove_files
 rm -rfv /etc/rc.d/rc*.d/*haproxy