arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adapter xcat softlayer rpm for 2.8.5

Browse Source
This commit is contained in:
Bruce Potter 2014-06-24 16:39:05 -04:00
parent 4691f35799
commit 417606b01a
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-SoftLayer/postscripts/configbond
View File

@ -19,7 +19,7 @@ if (scalar(@ARGV) < 2 || scalar(@ARGV) > 3) {
my $bond = shift(@ARGV);
my $nic = $ARGV[0];
my @devs;
push(@devs,@ARGV);
foreach my $a (@ARGV) { push(@devs,split('@',$a)); } # support the new syntax in the xcat configbond postscript
my $nicips = $ENV{NICIPS};
my $nicnetworks = $ENV{NICNETWORKS};
my $net_cnt = $ENV{NETWORKS_LINES};

12
xCAT-SoftLayer/si-post-install/20all.makeinitrd
View File

@ -1,4 +1,5 @@
#!/bin/bash
#Used only by sysclone
# This SI post-install script is needed because the initrd that autoyast/kickstart/ubuntu builds when installing
# sles/rh/ubuntu on the golden node may not have the drivers when that initrd runs on the node that is
@ -9,10 +10,11 @@
# And do whatever is necessary on ubuntu.
if [[ -f /sbin/dracut ]]; then
#todo: implement rh case using dracut
echo "Note: not regenerating the initrd, because dracut is not supported by this node yet."
# redhat/centos
echo "Running dracut to regenerate the initrd with the drivers needed by this node:"
dracut --force
else
# suse/sles
echo "Running mkinitrd to regenerate the initrd with the drivers needed by this node:"
mkinitrd
# suse/sles
echo "Running mkinitrd to regenerate the initrd with the drivers needed by this node:"
mkinitrd
fi

7
xCAT-SoftLayer/xCAT-SoftLayer.spec
View File

@ -84,4 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%post
# We are shipping the postscripts in a sysclone dir and then copying them to /install/postscripts here,
# because we want to allow base xcat to eventually ship them and not conflict on the file name/path
cp -f /%{prefix}/share/xcat/sysclone/postscripts/* /install/postscripts
# But base xcat now has a newer/better configbond written in bash, so if that is there do not overwrite it.
head /install/postscripts/configbond | grep -q -E '^#! */bin/bash'
if [[ $? != 0 ]]; then
# the new configbond from xcat 2.8.5 is not there, so copy ours
cp -f /%{prefix}/share/xcat/sysclone/postscripts/* /install/postscripts
fi