#! /bin/sh
#
# This file is part of DisOrder
-# Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+# Copyright (C) 2004, 2007-2009 Richard Kettlewell
#
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
set -e
--no-create-home jukebox
# If it happens that there's no audio group we don't fail; perhaps only
# network play was required.
- adduser --quiet jukebox audio || true
+ adduser jukebox audio || true
}
configure_init_d() {
}
restart_server() {
- /etc/init.d/disorder restart
- # Wait for the server to get going. This is a horrid bodge and ought
- # to be done away with, but is required for the time being. Sorry.
- sleep 5
+ local first
+ local time
+ invoke-rc.d disorder restart
+ # Wait for the server to start
+ first=true
+ time=0
+ while :; do
+ if disorder version >/dev/null 2>&1; then
+ break
+ else
+ if [ $time -gt 30 ]; then
+ echo
+ echo "Server did not stabilise in a reasonable amount of time"
+ exit 1
+ fi
+ if $first; then
+ printf "Waiting for server to stabilise"
+ first=false
+ fi
+ printf "."
+ sleep 1
+ fi
+ time=`expr $time + 1`
+ done
+ echo
}
setup_guest() {
create_config
;;
abort-upgrade )
- /etc/init.d/disorder restart
+ invoke-rc.d disorder restart
;;
reconfigure )
- /etc/init.d/disorder reload
+ invoke-rc.d disorder reload
;;
esac