Backport remove automated failover to recovery environment to 6.0.12.0 (

#35)

Makefile

@@ -5,18 +5,12 @@ all:
 	./scripts/stage1.sh $(CURDIR)/bin/recovery.img
 
 install:
-	install -D scripts/bootcount_reset \
-		$(DESTDIR)$(prefix)/bin/bootcount_reset
 	install -D scripts/recovery_sync \
 		$(DESTDIR)$(prefix)/bin/recovery_sync
 	install -D bin/recovery.img \
 		$(DESTDIR)/$(prefix)/share/recovery_environment/recovery.img
-	install -D scripts/42_bootcount \
-		$(DESTDIR)/etc/grub.d/42_bootcount
 	install -D scripts/42_recovery \
 		$(DESTDIR)/etc/grub.d/42_recovery
-	install -m 0644 -D scripts/delphix-bootcount.service \
-		$(DESTDIR)/lib/systemd/system/delphix-bootcount.service
 
 clean:
 	rm -rf bin/recovery.img
@@ -25,11 +19,8 @@ clean:
 distclean: clean
 
 uninstall:
-	-rm -f $(DESTDIR)/$(prefix)/bin/bootcount_reset
 	-rm -f $(DESTDIR)/$(prefix)/bin/recovery_sync
 	-rm -f $(DESTDIR)/$(prefix)/share/recovery_environment/recovery.img
-	-rm -f $(DESTDIR)/etc/grub.d/42_bootcount
 	-rm -f $(DESTDIR)/etc/grub.d/42_recovery
-	-rm -f $(DESTDIR)/lib/systemd/system/delphix-bootcount.service
 
 .PHONY: all install clean distclean uninstall

debian/postinst

@@ -67,12 +67,6 @@ find . -print0 | cpio --null --create --format=newc | gzip -7 >"$target" 2>/dev/
 # when doing an upgrade inside a container. As a result, we do not run
 # mkconfig in this script, and rely on the end-of-upgrade scripts to do it.
 #
-# Similary, the environment block in the bootloader is set by the bootcount
-# service after first boot, and the recovery environment will be synced when a
-# configuration change is made.
-#
-
-systemctl enable delphix-bootcount.service
 
 cd / || die "failed to cd /"
 rm -rf "$workdir"