From 1edaf15cef3420484d1dfbf08de43fe8d800ab64 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Mon, 28 Nov 2011 12:28:03 -0300
Subject: [archiso] Split archiso_pxe_nbd in two hooks.

One hook only setup the network device (archiso_pxe_common) the other
setup the NBD client (archiso_pxe_nbd).

New bootparam:
    archiso_pxe_srv=IP
        Allow to set an IP different from the PXE server.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 archiso/install/archiso_pxe_common | 24 ++++++++++++++++++++++++
 archiso/install/archiso_pxe_nbd    |  9 ---------
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 archiso/install/archiso_pxe_common

(limited to 'archiso/install')

diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common
new file mode 100644
index 0000000..ebf908e
--- /dev/null
+++ b/archiso/install/archiso_pxe_common
@@ -0,0 +1,24 @@
+# vim: set ft=sh:
+
+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')"
+    BINARIES=""
+    FILES=""
+    SCRIPT="archiso_pxe_common"
+
+    add_dir /tmp
+
+    add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for boot via PXE.
+HELPEOF
+}
diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd
index c26648c..4227623 100644
--- a/archiso/install/archiso_pxe_nbd
+++ b/archiso/install/archiso_pxe_nbd
@@ -3,20 +3,11 @@
 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_dir /tmp
-
     add_binary "/usr/sbin/nbd-client" "/bin/nbd-client"
-    add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig"
-
     add_file "/lib/initcpio/archiso_pxe_nbd" "/archiso_pxe_nbd"
 }
 
-- 
cgit v1.2.2