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

Fixed error in rc.statelite: /sysroot/etc/init.d/statelite: line 326: [!: command not found

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7133 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2010-08-19 01:29:28 +00:00
parent 3cced2fbb2
commit 5bc53f2fe4
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
View File

@ -323,7 +323,7 @@ ProcessType () {
fi
done
else
if [ ! -d ${PERSISTENT}${PPATH} ] && [! -d `readlink -m ${PERSISTENT}${PPERS}`]; then
if [[ ! -d ${PERSISTENT}${PPATH} && ! -d `readlink -m ${PERSISTENT}${PPERS}` ]]; then
# unless the entry is one directory or one link to the directory
rm -rf ${PERSISTENT}${PPERS}
mkdir -p ${PERSISTENT}${PPERS}

24
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -203,7 +203,12 @@ foreach (split /,/,$netdriver) {
if (/^$/) {
next;
}
push @ndrivers,$_;
# Do not include qeth module here
# This module is included later on
if (!($_ =~ m/qeth/i)) {
push @ndrivers, $_;
}
}
unless (grep /af_packet/,@ndrivers) {
unshift(@ndrivers,"af_packet.ko");
@ -223,7 +228,10 @@ if($mode eq "statelite") {
if ($arch eq "s390x") {
push @ndrivers, "qdio.ko";
push @ndrivers, "ccwgroup.ko";
push @ndrivers, "af_packet.ko";
# af_packet is already included above
# push @ndrivers, "af_packet.ko";
push @ndrivers, "qeth.ko";
push @ndrivers, "qeth_l2.ko";
push @ndrivers, "qeth_l3.ko";
@ -1052,7 +1060,7 @@ END
# 'sbin/udevd' and 'sbin/udevadm' needed on s390x
if ($arch eq "s390x") {
foreach ("sbin/udevd", "sbin/udevadm") {
foreach ("sbin/udevd", "sbin/udevadm", "usr/bin/readlink") {
getlibs($_);
push @filestoadd,$_;
}
@ -1118,6 +1126,16 @@ END
if ($arch eq "s390x") {
system("mkdir -p /tmp/xcatinitrd.$$/etc/udev");
system("cp -r $rootimg_dir/etc/udev/* /tmp/xcatinitrd.$$/etc/udev");
# Copy rules for network adapter
my $name = `cat /etc/sysconfig/network/ifcfg-$prinic | grep NAME`;
my $nic = '';
if ($name =~ m/(\d+\.\d+\.\d+)/g) {
$nic = $&;
}
system("cp -r /etc/udev/rules.d/*$nic.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
system("cp -r /etc/udev/rules.d/*persistent-net.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
system("mkdir -p /tmp/xcatinitrd.$$/lib/udev");
system("cp -r $rootimg_dir/lib/udev/* /tmp/xcatinitrd.$$/lib/udev");
}