From 61f2c5056ac3bc13079241c5b93191a37a89774d Mon Sep 17 00:00:00 2001 Message-Id: <61f2c5056ac3bc13079241c5b93191a37a89774d.1715545054.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 20 Apr 2008 11:29:52 +0100 Subject: [PATCH] For Debian installs, prerm now supports failed-upgrade, which is necessary as the 2.0.x prerm cannot survive new /usr/bin/disorder. Organization: Straylight/Edgeware From: Richard Kettlewell --- CHANGES | 4 ++++ debian/prerm.disorder-server | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 2e98627..f8e7ae7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +* Changes up to version 3.0.1 + +Debian upgrades from 2.0.x should now work better. + * Changes up to version 3.0 Important! See README.upgrades when upgrading. diff --git a/debian/prerm.disorder-server b/debian/prerm.disorder-server index 0e65ed6..394afcd 100755 --- a/debian/prerm.disorder-server +++ b/debian/prerm.disorder-server @@ -1,7 +1,7 @@ #! /bin/sh # # This file is part of DisOrder -# Copyright (C) 2004 Richard Kettlewell +# Copyright (C) 2008 Richard Kettlewell # # 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 @@ -18,5 +18,16 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA # -set -e -/etc/init.d/disorder stop +set - +case "$1" in +upgrade ) + /etc/init.d/disorder stop + ;; +failed-upgrade ) + # Upgrading from 2.0 to 3.0.x can provoke this problem. The 2.0 + # init script attempts to run disorder(1) but that isn't ready to go + # get as users.db has not been created. Therefore old-prerm upgrade + # fails and dpkg tries new-prerm failed-upgrade instead. + start-stop-daemon -K -q -n disorderd + ;; +esac -- [mdw]