From 6bdcc59f94ecd2fd84facda953f92e1d2a5cf727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <andre@pc-01.localdomain>
Date: Fri, 4 May 2012 15:33:55 -0300
Subject: updating all files

---
 archiso/install/archiso            | 39 ++++++++++++++------------------------
 archiso/install/archiso_kms        | 14 ++++++++++++++
 archiso/install/archiso_loop_mnt   | 15 +++++----------
 archiso/install/archiso_pxe_common | 30 +++++++++++++++++++++++++++++
 archiso/install/archiso_pxe_http   | 15 +++++++++++++++
 archiso/install/archiso_pxe_nbd    | 22 ++++++++-------------
 archiso/install/archiso_pxe_nfs    | 16 ++++++++++++++++
 archiso/install/archiso_shutdown   | 18 ++++++++++++++++++
 8 files changed, 120 insertions(+), 49 deletions(-)
 create mode 100644 archiso/install/archiso_kms
 create mode 100644 archiso/install/archiso_pxe_common
 create mode 100644 archiso/install/archiso_pxe_http
 create mode 100644 archiso/install/archiso_pxe_nfs
 create mode 100644 archiso/install/archiso_shutdown

(limited to 'archiso/install')

diff --git a/archiso/install/archiso b/archiso/install/archiso
index 514c011..c36c001 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -1,30 +1,19 @@
-build ()
-{
-    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
+#!/bin/bash
 
-    BINARIES=""
-    FILES=""
-
-    add_dir /cowspace
-    add_dir /copytoram
-    add_dir /bootmnt
-
-    add_binary /lib/udev/cdrom_id
-    add_binary /sbin/blockdev
-    add_binary /sbin/lvm
-    add_binary /sbin/dmsetup
+build() {
+    MODULES="cdrom loop dm-snapshot"
+    SCRIPT="archiso"
 
-    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
+    add_binary /usr/lib/udev/cdrom_id
+    add_binary blockdev
+    add_binary dmsetup
+    add_binary losetup
+    add_binary mountpoint
 
-    SCRIPT="archiso"
+    add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
+    add_file /usr/lib/udev/rules.d/10-dm.rules
+    add_file /usr/lib/udev/rules.d/95-dm-notify.rules
+    add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
 }
 
-# vim:ft=sh:ts=4:sw=4:et:
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_kms b/archiso/install/archiso_kms
new file mode 100644
index 0000000..6566049
--- /dev/null
+++ b/archiso/install/archiso_kms
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+build() {
+    MODULES="radeon nouveau i915 via-agp sis-agp intel-agp"
+    if [[ $(uname -m) == i686 ]]; then
+        MODULES+=" amd64-agp ati-agp sworks-agp ali-agp amd-k7-agp nvidia-agp efficeon-agp"
+    fi
+}
+
+help() {
+    cat << HELPEOF
+Adds all common KMS drivers to the initramfs image.
+HELPEOF
+}
diff --git a/archiso/install/archiso_loop_mnt b/archiso/install/archiso_loop_mnt
index 2c8d6f2..4141043 100644
--- a/archiso/install/archiso_loop_mnt
+++ b/archiso/install/archiso_loop_mnt
@@ -1,18 +1,13 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build ()
-{
-    MODULES=""
-
-    BINARIES=""
-    FILES=""
-    add_dir /img_dev
+build() {
     SCRIPT="archiso_loop_mnt"
 }
 
-help ()
-{
+help() {
 cat<<HELPEOF
   This hook loads the necessary modules for boot via loop device.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common
new file mode 100644
index 0000000..b37e5a1
--- /dev/null
+++ b/archiso/install/archiso_pxe_common
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+build() {
+    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')"
+    SCRIPT="archiso_pxe_common"
+
+
+    add_binary /lib/initcpio/ipconfig /bin/ipconfig
+
+    # Add hosts support files+dns
+    add_symlink /lib/libnss_files.so.2 $(readlink /lib/libnss_files.so.2)
+    add_binary $(readlink -f /lib/libnss_files.so.2)
+    add_symlink /lib/libnss_dns.so.2 $(readlink /lib/libnss_dns.so.2)
+    add_binary $(readlink -f /lib/libnss_dns.so.2)
+
+    add_dir /etc
+    echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
+}
+
+help() {
+cat<<HELPEOF
+  This hook loads the necessary modules for boot via PXE.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_pxe_http b/archiso/install/archiso_pxe_http
new file mode 100644
index 0000000..9e2ff65
--- /dev/null
+++ b/archiso/install/archiso_pxe_http
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+build() {
+    SCRIPT="archiso_pxe_http"
+
+    add_binary curl
+}
+
+help() {
+cat<<HELPEOF
+  This hook loads the necessary modules for boot via PXE and HTTP.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd
index c8ba1a4..1ee3910 100644
--- a/archiso/install/archiso_pxe_nbd
+++ b/archiso/install/archiso_pxe_nbd
@@ -1,24 +1,18 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build ()
-{
+build() {
     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"
 
-    add_binary "/usr/sbin/nbd-client" "/bin/nbd-client"
-    add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig"
+    add_binary nbd-client
+
+    add_file /usr/lib/initcpio/archiso_pxe_nbd /archiso_pxe_nbd
 }
 
-help ()
-{
+help() {
 cat<<HELPEOF
   This hook loads the necessary modules for boot via PXE and NBD.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_pxe_nfs b/archiso/install/archiso_pxe_nfs
new file mode 100644
index 0000000..f7b6f5d
--- /dev/null
+++ b/archiso/install/archiso_pxe_nfs
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+build() {
+    MODULES="nfs"
+    SCRIPT="archiso_pxe_nfs"
+
+    add_binary /lib/initcpio/nfsmount /bin/nfsmount
+}
+
+help() {
+    cat <<HELPEOF
+  This hook loads the necessary modules for boot via PXE and NFS.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/archiso/install/archiso_shutdown b/archiso/install/archiso_shutdown
new file mode 100644
index 0000000..87b8297
--- /dev/null
+++ b/archiso/install/archiso_shutdown
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+build() {
+    SCRIPT="archiso_shutdown"
+
+    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 others mount points, dm-snapshot devices and loopback devices.
+Mostly usefull for dm-snapshot persistent.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
-- 
cgit v1.2.2