Revert "Merge pull request #561 from bluecherrydvr/systemd"

This reverts commit 84bd4f6, reversing
changes made to c60ec63.

debian/bluecherry.init

@@ -0,0 +1,121 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          bluecherry
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Bluecherry DVR Server
+# Description:       Bluecherry DVR Server
+### END INIT INFO
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Bluecherry DVR Server"
+NAME=bc-server
+DAEMON=/usr/sbin/$NAME
+DAEMONUSER=bluecherry
+DAEMONGROUP=bluecherry
+DAEMON_ARGS="-s -u $DAEMONUSER -g $DAEMONGROUP"
+PIDDIR=/var/run/bluecherry
+PIDFILE=$PIDDIR/pid
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	mkdir -p "$PIDDIR"
+	chown "$DAEMONUSER:$DAEMONUSER" "$PIDDIR"
+
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon -qtSp $PIDFILE -x $DAEMON > /dev/null || return 1
+	start-stop-daemon -qSbmp $PIDFILE -x $DAEMON -- $DAEMON_ARGS \
+	|| return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon -qKR TERM/30/KILL/5 -p $PIDFILE -n $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon -qKoR 0/30/KILL/5 -x $DAEMON
+	[ "$?" = 2 ] && return 2
+
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	[ "$VERBOSE" != no ] && case "$?" in
+		0|1) log_end_msg 0 ;;
+		2)   log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	[ "$VERBOSE" != no ] && case "$?" in
+		0|1) log_end_msg 0 ;;
+		2)   log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME"
+       exit
+       ;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		log_end_msg "$?"
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

debian/rules

@@ -9,17 +9,16 @@ LD_LIBRARY_PATH+=:stage/lib
 RELEASE_NAME := $(shell ./scripts/build_helper/get_distro_release_name.sh)
 
 %:
-	dh --parallel $@ --with systemd
+	dh --parallel $@
 
 .PHONY: override_dh_strip debian/control
 
 override_dh_strip:
 	dh_strip --dbg-package=bluecherry-dbg
 
-#override_dh_installinit: sbin-start=$(wildcard /sbin/start)
+override_dh_installinit: sbin-start=$(wildcard /sbin/start)
 override_dh_installinit:
-	#dh_installinit $(if $(sbin-start),--name=bluecherry)
-	dh_installinit --name=bluecherry
+	dh_installinit $(if $(sbin-start),--name=bluecherry)
 
 override_dh_installlogrotate:
 	dh_installlogrotate
@@ -49,4 +48,3 @@ override_dh_shlibdeps:
 
 override_dh_usrlocal:
 	true
-

misc/postinstall.sh

@@ -302,7 +302,8 @@ case "$1" in
 				exit 1
 			fi
 
-			BC_GENERAL_VERSION=`echo "SELECT value from GlobalSettings WHERE parameter = 'G_DVR_NAME'" | mysql -h "$host" -D"$dbname" -u"$user" -p"$password" | tail -n 1 | tr "Bluecherry DVR v" " "`
+			BC_GENERAL_VERSION=`echo "SELECT value from GlobalSettings WHERE parameter = 'G_DVR_NAME'" \
+				| mysql -h "localhost" -D"bluecherry" -u"bluecherry" -p"bluecherry" | tail -n 1 | tr "Bluecherry DVR v" " "`
 
 			if [ $BC_GENERAL_VERSION == 2 ];
 			then