From 85d243ff5836fc17416c65dca8a9e8b4e9d915bc Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Sat, 18 Jun 2011 18:38:58 -0300
Subject: [archiso] Use dm-snapshot instead of aufs2 (A.K.A. "The Big Commit")

* Use device mapper + snapshot module, instead union layer filesystem.
  * A block-level approach vs vfs-level.
  * No more unofficial (Linux) things.
  * More memory is needed.
* Refactor mkarchiso.
* Refactor hooks/archiso.
* Fix install/archiso_pxe_nbd
  (due recent change in mkinitcpio-0.6.15 on checked_modules()/all_modules())
  [Thanks Dave for the improved workaround]
* New configs/releng to build official images.
  * Works with a Bash script instead of Makefile.
    (better control and easy to maintain)
* Remove configs/syslinux-iso.
* Remove archiso2dual script. Integrate functionality in configs/releng.
* New configs/baseline to build the most basic live medium or use as template.
* New README (draft). [Thanks Dieter for fixing english grammar]

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 archiso/install/archiso         | 23 +++++++++++++----------
 archiso/install/archiso_pxe_nbd |  8 ++++++--
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'archiso/install')

diff --git a/archiso/install/archiso b/archiso/install/archiso
index 7ad9d06..3ac6246 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -1,25 +1,28 @@
 install ()
 {
-    MODULES="cdrom ide-cd_mod ide-core ide-generic aufs squashfs isofs loop $(all_modules '/kernel/fs' | grep -v "nls") "
-    MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd")"
-    MODULES=$(echo ${MODULES}) #trim whitespace
-    if [ "x${MODULES}" != "x" ]; then
-        MODULES="${MODULES} usb_storage sd_mod sr_mod"
-    fi
+    MODULES="cdrom ide-cd_mod ide-core ide-generic loop dm-mod dm-snapshot squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls")"
+    MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")"
+    MODULES="${MODULES} usb_storage sd_mod sr_mod"
     MODULES="${MODULES} virtio_pci virtio_blk"
+    MODULES=$(echo ${MODULES}) #trim whitespace
 
     BINARIES=""
     FILES=""
-    add_dir /rw_branch
-    add_dir /ro_branch
+
+    add_dir /cowspace
     add_dir /copytoram
     add_dir /bootmnt
 
-    add_device /lib/udev/devices/loop0 b 7 0
-
     add_binary /lib/udev/cdrom_id
+    add_binary /sbin/blockdev
+    add_binary /sbin/lvm
+    add_binary /sbin/dmsetup
 
     add_file /lib/udev/rules.d/60-cdrom_id.rules
+    add_file /lib/udev/rules.d/10-dm.rules
+    add_file /lib/udev/rules.d/13-dm-disk.rules
+    add_file /lib/udev/rules.d/95-dm-notify.rules
+    add_file /lib/udev/rules.d/11-dm-lvm.rules
 
     SCRIPT="archiso"
 }
diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd
index fbf43c6..189a7b1 100644
--- a/archiso/install/archiso_pxe_nbd
+++ b/archiso/install/archiso_pxe_nbd
@@ -2,8 +2,12 @@
 
 install ()
 {
-    MODULES="nbd $(checked_modules "/drivers/net/" | grep -v -e "/irda/" -e "/phy/" -e "/plip" -e "/ppp" -e "/wimax/" -e "/wireless/") "
-
+    MODULES="nbd"
+    MODULES="${MODULES} $(comm -2 -3 <(checked_modules "/drivers/net/" | sort) \
+                                     <(find $MODULEDIR/kernel/drivers/net/{irda,phy,wimax,wireless} \
+                                            -name '*.ko*' \
+                                            -exec bash -c 'printf "%s\n" "${@%%.ko*}" | sed "s@.*/@@;s@-@_@" | sort' _ {} +) \
+                                     | grep -v -e 'ppp_' -e 'plip' -e 'pppoe')"
     BINARIES=""
     FILES=""
     SCRIPT="archiso_pxe_nbd"
-- 
cgit v1.2.3-70-g09d2