From 71238884938e1512e10f9c7809443f07fe5e5fc1 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 2 Dec 2021 14:12:26 +0200
Subject: Remove obsolete archiso_shutdown hook

The functionality it provides has been available in mkinitcpio itself since 2013.
https://lists.archlinux.org/pipermail/arch-dev-public/2013-December/025742.html

Implements #8.
---
 Makefile                 |  7 ++-----
 hooks/archiso_shutdown   | 10 ----------
 install/archiso_shutdown | 20 --------------------
 script/archiso_shutdown  | 41 -----------------------------------------
 4 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 hooks/archiso_shutdown
 delete mode 100644 install/archiso_shutdown
 delete mode 100644 script/archiso_shutdown

diff --git a/Makefile b/Makefile
index 2dadcee..62e370a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,10 @@
 PREFIX ?= /usr/local
 INSTALL_DIR=$(DESTDIR)$(PREFIX)/lib/initcpio/install
 HOOKS_DIR=$(DESTDIR)$(PREFIX)/lib/initcpio/hooks
-SCRIPT_DIR=$(DESTDIR)$(PREFIX)/lib/initcpio
 DOC_DIR=$(DESTDIR)$(PREFIX)/share/doc/mkinitcpio-archiso
 
 INSTALL_FILES=$(wildcard install/*)
 HOOKS_FILES=$(wildcard hooks/*)
-SCRIPT_FILES=$(wildcard script/*)
 DOC_FILES=$(wildcard docs/*) $(wildcard *.rst)
 
 all:
@@ -18,15 +16,14 @@ check: shellcheck shfmt
 
 shellcheck:
 	shellcheck -s bash $(INSTALL_FILES)
-	shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES)
+	shellcheck -s dash $(HOOKS_FILES)
 
 shfmt:
-	shfmt -i 4 -d $(HOOKS_FILES) $(INSTALL_FILES) $(SCRIPT_FILES)
+	shfmt -i 4 -d $(HOOKS_FILES) $(INSTALL_FILES)
 
 install: install-initcpio install-doc
 
 install-initcpio:
-	install -vDm 755 $(SCRIPT_FILES) -t $(SCRIPT_DIR)
 	install -vDm 644 $(HOOKS_FILES) -t $(HOOKS_DIR)
 	install -vDm 644 $(INSTALL_FILES) -t $(INSTALL_DIR)
 
diff --git a/hooks/archiso_shutdown b/hooks/archiso_shutdown
deleted file mode 100644
index ebb6b11..0000000
--- a/hooks/archiso_shutdown
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/ash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-run_cleanuphook() {
-    rm -rf /usr/lib/modules
-    cp -ax / /run/initramfs
-}
-
-# vim: set ft=sh:
diff --git a/install/archiso_shutdown b/install/archiso_shutdown
deleted file mode 100644
index b2c6bd4..0000000
--- a/install/archiso_shutdown
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-build() {
-    add_binary cp
-
-    add_runscript
-
-    add_file /usr/lib/initcpio/archiso_shutdown /shutdown
-}
-
-help() {
-    cat <<HELPEOF
-This hook will create a shutdown initramfs in /run/initramfs
-that we can pivot to on shutdown in order to unmount / and
-and other mount points, dm-snapshot and loopback devices.
-Mostly useful for persistent dm-snapshot.
-HELPEOF
-}
diff --git a/script/archiso_shutdown b/script/archiso_shutdown
deleted file mode 100644
index dd3bb96..0000000
--- a/script/archiso_shutdown
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/ash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# /oldroot depends on things inside /oldroot/run/archiso...
-mkdir /oldrun
-mount -n --move /oldroot/run /oldrun
-
-# Unmount all mounts now.
-umount "$(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)"
-
-# Remove all dm-snapshot devices.
-dmsetup remove_all
-
-# Remove all loopback devices.
-for _lup in $(grep ^/dev/loop /oldrun/archiso/used_block_devices | tac); do
-    if ! losetup -d -- "${_lup}" 2>/dev/null; then
-        umount -d -- "${_lup}"
-    fi
-done
-
-# Unmount the space used to store *.cow.
-umount /oldrun/archiso/cowspace
-
-# Unmount boot device if needed (no copytoram=y used)
-if [ ! -d /oldrun/archiso/copytoram ]; then
-    if [ -d /oldrun/archiso/img_dev ]; then
-        umount /oldrun/archiso/img_dev
-    else
-        umount /oldrun/archiso/bootmnt
-    fi
-fi
-
-# reboot / poweroff / halt, depending on the argument passed by init
-# if something invalid is passed, we halt
-case "$1" in
-reboot | poweroff | halt) "$1" -f ;;
-*) halt -f ;;
-esac
-
-# vim: set ft=sh:
-- 
cgit v1.2.3-54-g00ecf