Fixes for the deb packaging

* add prerm / postrm scripts * fix osvcd stop when package is removed * remove opt from chroot file list
arnaudveron · Mar 4, 2019 · 0752085 · 0752085
1 parent 0b8a019
commit 0752085
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/bin/pkg/make.lib b/bin/pkg/make.lib
@@ -117,6 +117,7 @@ function prepare_chroot {
 
 	# purge unwanted files
 	rm -rf $CHROOT/opt/opensvc
+        rmdir $CHROOT/opt
 
 	cd $OSVC
 	$SUDO chown -Rh 0:0 $CHROOT/* || return 1

diff --git a/bin/pkg/make_deb b/bin/pkg/make_deb
@@ -68,6 +68,12 @@ Provides: opensvc
 Description: $SUMMARY
 EOF
 
+cp $PATH_SCRIPT/../preuninstall $CHROOT/DEBIAN/prerm
+chmod 755 $CHROOT/DEBIAN/prerm
+
+cp $PATH_SCRIPT/../postremove $CHROOT/DEBIAN/postrm
+chmod 755 $CHROOT/DEBIAN/postrm
+
 echo "$DESCRIPTION" | sed -e "s/^/ /" >>$CHROOT/DEBIAN/control
 
 $SUDO chown -R root:root $CHROOT/DEBIAN

diff --git a/bin/postremove b/bin/postremove
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  purge)
+    rm -rf /var/lib/opensvc /var/log/opensvc /etc/opensvc /usr/share/opensvc
+    ;;
+
+  upgrade|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/bin/preuninstall b/bin/preuninstall
@@ -8,6 +8,12 @@ then
 	ARGS=0
 fi
 
+if [ $OSFLAVOR = 'Linux' -a $ARGS = 'remove' ]
+then
+	ARGS=0
+fi
+
+
 if [ -z "$OSVC_ROOT_PATH" ]
 then
 	FLAG=/var/lib/opensvc/postinstall.restart
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,12 @@ then @@
     	ARGS=0
     fi
+    if [ $OSFLAVOR = 'Linux' -a $ARGS = 'remove' ]
+    then
+    	ARGS=0
+    fi
     if [ -z "$OSVC_ROOT_PATH" ]
     then
     	FLAG=/var/lib/opensvc/postinstall.restart
@@ Expand Down @@