From 3fd9e5cb9c82a0d70483fc78d6392b83af468955 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 31 Aug 2011 17:59:33 +0000
Subject: [PATCH] Clean up output put getcert into initramfs fix openssl.cnf so
 it can actually be used in openssl req

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10419 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-nbroot2/getcert         |  3 +--
 xCAT-nbroot2/install         |  1 +
 xCAT-nbroot2/xcat-cmdline.sh | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/xCAT-nbroot2/getcert b/xCAT-nbroot2/getcert
index 8507b9c7a..99e81a2e4 100755
--- a/xCAT-nbroot2/getcert
+++ b/xCAT-nbroot2/getcert
@@ -5,7 +5,7 @@ if [ -z "$XCATDEST" ]; then
 	XCATDEST=$1
 fi
 #retry in case certkey.pem is not right, yet
-while ! openssl req -new -key /etc/xcat/certkey.pem -out /tmp/tls.csr -subj "/CN=`hostname`"; do
+while ! openssl req -new -key /etc/xcat/certkey.pem -out /tmp/tls.csr -subj "/CN=`hostname`" >& /dev/null; do
 	sleep 1
 done
 echo "<xcatrequest>
@@ -36,7 +36,6 @@ if grep 'BEGIN CERTIFICATE' /tmp/certresp.xml > /dev/null; then
 		lldptool -T -i $iface -V sysDesc enableTx=no
 	done
 fi
-cat /tmp/certreq.xml
 rm /tmp/certreq.xml
 rm /tmp/certresp.xml
 kill $CREDPID
diff --git a/xCAT-nbroot2/install b/xCAT-nbroot2/install
index 7e6873e89..a820c19e8 100755
--- a/xCAT-nbroot2/install
+++ b/xCAT-nbroot2/install
@@ -588,6 +588,7 @@ inst "$moddir/udpcat.awk" "/bin/udpcat.awk"
 inst "$moddir/minixcatd.awk" "/bin/minixcatd.awk"
 inst "$moddir/bmcsetup" "/bin/bmcsetup"
 inst "$moddir/allowcred.awk" "/bin/allowcred.awk"
+inst "$moddir/getcert" "/bin/getcert"
 inst "$moddir/dhclient.conf" "/etc/dhclient.conf"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
 inst "$moddir/rsyslog.conf" "/etc/rsyslog.conf"
diff --git a/xCAT-nbroot2/xcat-cmdline.sh b/xCAT-nbroot2/xcat-cmdline.sh
index 4af1b52a0..a0eab5a24 100755
--- a/xCAT-nbroot2/xcat-cmdline.sh
+++ b/xCAT-nbroot2/xcat-cmdline.sh
@@ -56,7 +56,10 @@ echo 'Protocol 2' >> /etc/ssh/sshd_config
 /usr/sbin/sshd
 mkdir -p /etc/xcat
 mkdir -p /etc/pki/tls
-touch /etc/pki/tls/openssl.cnf
+echo "[ req ]
+distinguished_name = nodedn
+
+[ nodedn ]" > /etc/pki/tls/openssl.cnf
 openssl genrsa -out /etc/xcat/privkey.pem 1024
 PUBKEY=`openssl rsa -in /etc/xcat/privkey.pem -pubout|grep -v "PUBLIC KEY"`
 PUBKEY=`echo $PUBKEY|sed -e 's/ //g'`
@@ -103,7 +106,17 @@ if dmidecode|grep IPMI > /dev/null; then
 	modprobe ipmi_si
 	modprobe ipmi_devintf
 fi
+XCATPORT=3001
+export XCATPORT
+for parm in `cat /proc/cmdline`; do
+        key=`echo $parm|awk -F= '{print $1}'`
+        if [ "$key" = "xcatd" ]; then
+                XCATMASTER=`echo $parm|awk -F= '{print $2}'|awk -F: '{print $1}'`
+                XCATPORT=`echo $parm|awk -F= '{print $2}'|awk -F: '{print $2}'`
+        fi
+done
 if [ "$destiny" = "discover" ]; then #skip a query to xCAT when /proc/cmdline will do
 	/bin/dodiscovery
 fi
+/bin/getcert $XCATMASTER:$XCATPORT
 /bin/sh