From 5ea02f68fe56a074970d11d7a1a3c0290ea8773f Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Tue, 17 Jul 2012 01:44:43 -0300
Subject: [archiso] archiso_shutdown: use run_cleanuphook()

Simplify build process, using the same method like in shutdown hook by mkinitcpio
we still need a custom shutdown script for archiso,
since "twisted" structure of block devices.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 archiso/hooks/archiso_shutdown   | 27 +++++----------------------
 archiso/install/archiso_shutdown |  2 ++
 2 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'archiso')

diff --git a/archiso/hooks/archiso_shutdown b/archiso/hooks/archiso_shutdown
index 24e4103..e50dedb 100644
--- a/archiso/hooks/archiso_shutdown
+++ b/archiso/hooks/archiso_shutdown
@@ -1,23 +1,6 @@
-run_hook ()
-{
-    msg -n ":: Creating shutdown ramfs..."
-
-    for _dir in bin lib sbin usr/bin usr/lib usr/sbin; do
-        mkdir -p /run/initramfs/${_dir}
-    done
-    cp /bin/busybox /run/initramfs/bin/
-    cp /lib/ld-* /run/initramfs/lib/
-    cp /lib/lib* /run/initramfs/lib/
-    cp /usr/lib/lib* /run/initramfs/usr/lib/
-    cp /bin/mount /run/initramfs/bin/
-    cp /sbin/dmsetup /run/initramfs/sbin/
-    cp /sbin/losetup /run/initramfs/sbin/
-    if [[ -x /bin/nbd-client ]]; then
-        cp /bin/nbd-client /run/initramfs/bin/
-    fi
-
-    chroot /run/initramfs /bin/busybox --install
-    cp /shutdown /run/initramfs/
-
-    msg "done."
+run_cleanuphook() {
+    rm -rf /usr/lib/modules
+    cp -ax / /run/initramfs
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_shutdown b/archiso/install/archiso_shutdown
index 962be95..5ae976a 100644
--- a/archiso/install/archiso_shutdown
+++ b/archiso/install/archiso_shutdown
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 build() {
+    add_binary cp
+
     add_runscript
 
     add_file /usr/lib/initcpio/archiso_shutdown /shutdown
-- 
cgit v1.2.3-54-g00ecf