From 0bc22e962f2106d98ef911cd0a935c128b84f8a1 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 16 Jan 2012 15:00:36 +0000 Subject: [PATCH] lldptool now outputs data, quiet it Add more firmware management incurred requirements to image git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11387 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-nbroot2/dhclient-script | 2 +- xCAT-nbroot2/getcert | 2 +- xCAT-nbroot2/install | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xCAT-nbroot2/dhclient-script b/xCAT-nbroot2/dhclient-script index 53184410a..4ac4af5d5 100755 --- a/xCAT-nbroot2/dhclient-script +++ b/xCAT-nbroot2/dhclient-script @@ -16,7 +16,7 @@ elif [ $reason = "BOUND" ]; then fi if [ ! -z "$new_host_name" ]; then hostname $new_host_name - lldptool -T -i $interface -V 5 enableTx=yes + lldptool -T -i $interface -V 5 enableTx=yes >& /dev/null fi if [ ! -z "$new_domain_name" ]; then echo search $new_domain_name >> /etc/resolv.conf diff --git a/xCAT-nbroot2/getcert b/xCAT-nbroot2/getcert index 99e81a2e4..f00ffc5b9 100755 --- a/xCAT-nbroot2/getcert +++ b/xCAT-nbroot2/getcert @@ -33,7 +33,7 @@ if grep 'BEGIN CERTIFICATE' /tmp/certresp.xml > /dev/null; then awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' < /tmp/certresp.xml > /etc/xcat/cert.pem #stop transmitting sysDesc, allowing the public key to age out of validity for iface in `grep '^ e' /var/lib/lldpad/lldpad.conf|awk '{print $1}' `; do - lldptool -T -i $iface -V sysDesc enableTx=no + lldptool -T -i $iface -V sysDesc enableTx=no >& /dev/null done fi rm /tmp/certreq.xml diff --git a/xCAT-nbroot2/install b/xCAT-nbroot2/install index 27c2f4c35..22031a13b 100755 --- a/xCAT-nbroot2/install +++ b/xCAT-nbroot2/install @@ -1,6 +1,8 @@ #!/bin/sh echo $drivers dracut_install wget openssl tar ipmitool cpio gzip lsmod ethtool modprobe touch echo cut wc +dracut_install netstat # broadcom update requires +dracut_install uniq # mellanox update requires dracut_install grep ip hostname awk egrep grep dirname expr dracut_install mount.nfs sshd vi reboot lspci parted screen mkfs mkfs.ext4 mkfs.btrfs #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm @@ -10,6 +12,9 @@ dracut_install poweroff ntpq ntpd hwclock date /usr/share/terminfo/x/xterm /etc/ dracut_install /sbin/rsyslogd /etc/protocols umount /bin/rpm /usr/lib/rpm/rpmrc dracut_install chmod /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /lib/libm.so.6 /sbin/route /sbin/ifconfig /usr/bin/head /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids #ibm fw wrapper requirements dracut_install dmidecode /usr/lib64/libstdc++.so.6 #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si +dracut_install dmidecode /usr/lib64/libstdc++.so.5 #broadcom firmware update links against old lib +dracut_install /lib/libpthread.so.0 #32 bit lib because UXSPI will not ship a native 64 bit build +dracut_install /usr/lib64/libldap-2.4.so.2 /usr/lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these... dracut_install /usr/share/zoneinfo/posix/Zulu dracut_install /usr/share/zoneinfo/posix/GMT-0 dracut_install /usr/share/zoneinfo/posix/Europe/Istanbul