Control: tag -1 patch
On 07/03/2021 16.23, Thomas Lange wrote:
You need to manually migrate the existing diversion to the new name.
Can you please point me to examples how to do this?
The attached patch fixes the buster->bullseye upgrade for me.
Andreas
>From bcb031f4d729fd8f44e6a5a8550b812b05047127 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 11 Mar 2021 13:31:26 +0100
Subject: [PATCH] migrate diverted file from /etc/init.d/rcS.distrib to
/etc/init.d/rcS.orig
---
debian/fai-nfsroot.preinst | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/fai-nfsroot.preinst b/debian/fai-nfsroot.preinst
index a2b5d45e..119a4cd5 100755
--- a/debian/fai-nfsroot.preinst
+++ b/debian/fai-nfsroot.preinst
@@ -1,10 +1,20 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
if [ ! -f /.THIS_IS_THE_FAI_NFSROOT ]; then
echo "ERROR: The package fai-nfsroot can only be installed inside the nfsroot."
exit 1
fi
+if [ -n "$(dpkg-divert --list /etc/init.d/rcS.distrib)" ]; then
+ # migrate diverted file from /etc/init.d/rcS.distrib to /etc/init.d/rcS.orig
+ dpkg-divert --package fai-nfsroot --no-rename --remove /etc/init.d/rcS
+ if [ -e /etc/init.d/rcS.distrib ]; then
+ mv /etc/init.d/rcS.distrib /etc/init.d/rcS.orig
+ fi
+ dpkg-divert --package fai-nfsroot --no-rename --divert /etc/init.d/rcS.orig --add /etc/init.d/rcS
+fi
+
dpkg-divert --package fai-nfsroot --add --divert /etc/init.d/rcS.orig --rename /etc/init.d/rcS
#DEBHELPER#
--
2.20.1
