From db2261cd0254821d4e98f4a1d6a698c931847a2e Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 7 Jan 2013 19:50:18 +0000
Subject: [PATCH] Move IMM support from builder to scripts Create a fake ifup
 to fixup IMM network during uxspi execution

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14787 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-genesis-builder/install                                  | 2 --
 xCAT-genesis-scripts/bin/ifup                                 | 4 ++++
 .../etc/udev/rules.d}/99-imm.rules                            | 0
 .../sbin}/setupimmnic                                         | 0
 xCAT-genesis-scripts/xCAT-genesis-scripts.spec                | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100755 xCAT-genesis-scripts/bin/ifup
 rename {xCAT-genesis-builder => xCAT-genesis-scripts/etc/udev/rules.d}/99-imm.rules (100%)
 rename {xCAT-genesis-builder => xCAT-genesis-scripts/sbin}/setupimmnic (100%)

diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index c8fbfde30..d65982d6b 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -594,9 +594,7 @@ inst "$moddir/restart" "/bin/restart"
 inst "$moddir/dhclient.conf" "/etc/dhclient.conf"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
 inst "$moddir/rsyslog.conf" "/etc/rsyslog.conf"
-inst "$moddir/99-imm.rules" "/etc/udev/rules.d/99-imm.rules"
 inst "$moddir/98-mlx.rules" "/etc/udev/rules.d/98-mlx.rules"
-inst "$moddir/setupimmnic" "/sbin/setupimmnic"
 inst "$moddir/loadmlxeth" "/sbin/loadmlxeth"
 dracut_install /sbin/rpc.statd /usr/sbin/sm-notify /etc/netconfig rpcbind /etc/host.conf /usr/sbin/rpc.idmapd
 dracut_install ps free find #debug 
diff --git a/xCAT-genesis-scripts/bin/ifup b/xCAT-genesis-scripts/bin/ifup
new file mode 100755
index 000000000..e5d7491e5
--- /dev/null
+++ b/xCAT-genesis-scripts/bin/ifup
@@ -0,0 +1,4 @@
+if [ "${1%?}" = "usb" ]; then
+	/sbin/setupimmnic
+fi
+exit 0
diff --git a/xCAT-genesis-builder/99-imm.rules b/xCAT-genesis-scripts/etc/udev/rules.d/99-imm.rules
similarity index 100%
rename from xCAT-genesis-builder/99-imm.rules
rename to xCAT-genesis-scripts/etc/udev/rules.d/99-imm.rules
diff --git a/xCAT-genesis-builder/setupimmnic b/xCAT-genesis-scripts/sbin/setupimmnic
similarity index 100%
rename from xCAT-genesis-builder/setupimmnic
rename to xCAT-genesis-scripts/sbin/setupimmnic
diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
index 1a3a895dd..d5cf072ee 100644
--- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
+++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
@@ -52,6 +52,7 @@ tar jxf %{SOURCE1}
 mkdir -p opt/xcat/share/xcat/netboot/genesis/x86_64/
 mv xCAT-genesis-scripts opt/xcat/share/xcat/netboot/genesis/x86_64/fs
 rm opt/xcat/share/xcat/netboot/genesis/x86_64/fs/*.spec
+rm opt/xcat/share/xcat/netboot/genesis/x86_64/fs/LICENSE.html
 cd -