From 180ad44f89888fae4f9e66a8fa9ee6878cafc93b Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 2 Jul 2008 15:44:32 +0000
Subject: [PATCH] -Have ahci driver loadable in the nbkernel

---
 nbkernel/modlist-2.6.18-92.el5.ppc64  |  2 +-
 nbkernel/modlist-2.6.18-92.el5.x86    |  3 ++-
 nbkernel/modlist-2.6.18-92.el5.x86_64 |  3 ++-
 nbkernel/xcat-nbz.spec                | 11 ++++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nbkernel/modlist-2.6.18-92.el5.ppc64 b/nbkernel/modlist-2.6.18-92.el5.ppc64
index 53e16e0..13cdfb1 100644
--- a/nbkernel/modlist-2.6.18-92.el5.ppc64
+++ b/nbkernel/modlist-2.6.18-92.el5.ppc64
@@ -61,9 +61,9 @@ kernel/drivers/net/ehea/ehea.ko
 kernel/drivers/net/netconsole.ko
 kernel/drivers/net/mii.ko
 kernel/drivers/net/e1000/e1000.ko
+kernel/drivers/net/e1000e/e1000e.ko
 kernel/drivers/net/myri10ge/myri10ge.ko
 kernel/drivers/net/ifb.ko
-kernel/drivers/net/e1000e/e1000e.ko
 kernel/drivers/net/igb/igb.ko
 kernel/drivers/net/bnx2.ko
 kernel/drivers/net/tg3.ko
diff --git a/nbkernel/modlist-2.6.18-92.el5.x86 b/nbkernel/modlist-2.6.18-92.el5.x86
index f34fc19..e9b2372 100644
--- a/nbkernel/modlist-2.6.18-92.el5.x86
+++ b/nbkernel/modlist-2.6.18-92.el5.x86
@@ -64,6 +64,7 @@ kernel/drivers/block/loop.ko
 kernel/drivers/net/netconsole.ko
 kernel/drivers/net/e100.ko
 kernel/drivers/net/e1000/e1000.ko
+kernel/drivers/net/e1000e/e1000e.ko
 kernel/drivers/net/myri10ge/myri10ge.ko
 kernel/drivers/net/bnx2.ko
 kernel/drivers/net/tg3.ko
@@ -97,7 +98,7 @@ kernel/drivers/ata/sata_promise.ko
 kernel/drivers/scsi/libsas/libsas.ko
 kernel/drivers/scsi/megaraid/megaraid_sas.ko
 kernel/drivers/ata/sata_sx4.ko
-kernel/drivers/scsi/ahci.ko
+kernel/drivers/ata/ahci.ko
 kernel/drivers/scsi/lpfc/lpfc.ko
 kernel/drivers/ata/sata_via.ko
 kernel/drivers/scsi/sd_mod.ko
diff --git a/nbkernel/modlist-2.6.18-92.el5.x86_64 b/nbkernel/modlist-2.6.18-92.el5.x86_64
index f34fc19..e9b2372 100644
--- a/nbkernel/modlist-2.6.18-92.el5.x86_64
+++ b/nbkernel/modlist-2.6.18-92.el5.x86_64
@@ -64,6 +64,7 @@ kernel/drivers/block/loop.ko
 kernel/drivers/net/netconsole.ko
 kernel/drivers/net/e100.ko
 kernel/drivers/net/e1000/e1000.ko
+kernel/drivers/net/e1000e/e1000e.ko
 kernel/drivers/net/myri10ge/myri10ge.ko
 kernel/drivers/net/bnx2.ko
 kernel/drivers/net/tg3.ko
@@ -97,7 +98,7 @@ kernel/drivers/ata/sata_promise.ko
 kernel/drivers/scsi/libsas/libsas.ko
 kernel/drivers/scsi/megaraid/megaraid_sas.ko
 kernel/drivers/ata/sata_sx4.ko
-kernel/drivers/scsi/ahci.ko
+kernel/drivers/ata/ahci.ko
 kernel/drivers/scsi/lpfc/lpfc.ko
 kernel/drivers/ata/sata_via.ko
 kernel/drivers/scsi/sd_mod.ko
diff --git a/nbkernel/xcat-nbz.spec b/nbkernel/xcat-nbz.spec
index 4dd0043..bcad33a 100644
--- a/nbkernel/xcat-nbz.spec
+++ b/nbkernel/xcat-nbz.spec
@@ -21,7 +21,7 @@ Source2: modlist-2.6.18-92.el5.ppc64
 %endif
 BuildArch: noarch
 %define name	xCAT-nbkernel-%{tarch}
-Release: 2
+Release: 5
 Epoch: 1
 AutoReq: false
 AutoProv: false
@@ -73,6 +73,15 @@ mkdir -p $RPM_BUILD_ROOT
 cd %{name}
 cp -a * $RPM_BUILD_ROOT
 
+%post
+if [ "$1" == "2" ]; then #only on upgrade, as on install it's probably not going to work...
+    if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
+      . /etc/profile.d/xcat.sh
+       mknb %{tarch}
+   fi
+fi
+
+
 %Files
 %defattr(-,root,root)
 /