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

fix one bug for "FindFile()" function in rc.statelite

Browse Source 
now, "ls -A ${path}|wc -l" is used to judge whether one directory is empty or not


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7094 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2010-08-15 16:06:23 +00:00
parent ca175714e3
commit 92b99d0a9d
7 changed files with 7 additions and 6 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

@ -386,7 +386,7 @@ FindFile () {
do
if [ -e ${TREEMOUNT}/${DIR}${path} ]; then
FOUND=1 # we found it!
if [ -z $(ls ${TREEMOUNT}/${DIR}${path}) ]; then
if [ -d ${TREEMOUNT}/${DIR}${path} ] && [ "0" -eq `ls -A ${TREEMOUNT}/${DIR}${path} |wc -l` ]; then
FOUND=0
else
ProcessType ${TREEMOUNT}/${DIR}${path} ${path} ${type} ${isChild}

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

@ -386,7 +386,7 @@ FindFile () {
do
if [ -e ${TREEMOUNT}/${DIR}${path} ]; then
FOUND=1 # we found it!
if [ -z $(ls ${TREEMOUNT}/${DIR}${path}) ]; then
if [ -d ${TREEMOUNT}/${DIR}${path} ] && [ "0" -eq `ls -A ${TREEMOUNT}/${DIR}${path} |wc -l` ]; then
FOUND=0
else
ProcessType ${TREEMOUNT}/${DIR}${path} ${path} ${type} ${isChild}

2
xCAT-server/share/xcat/netboot/fedora12/genimage
View File

@ -922,7 +922,7 @@ EOMS
}
}
# add rsync for statelite
foreach ("bin/cpio","bin/mkdir","sbin/insmod","sbin/nash","bin/sleep","sbin/ifconfig","bin/grep","sbin/dhclient","bin/dash","bin/mount","bin/mknod","usr/bin/wget","sbin/rmmod","sbin/mount.nfs","/usr/bin/rsync") {
foreach ("bin/cpio","bin/mkdir","sbin/insmod","sbin/nash","bin/sleep","sbin/ifconfig","bin/grep","sbin/dhclient","bin/dash","bin/mount","bin/mknod","usr/bin/wget","sbin/rmmod","sbin/mount.nfs","usr/bin/rsync", "usr/bin/wc") {
getlibs($_);
push @filestoadd,$_;
}

2
xCAT-server/share/xcat/netboot/rh/dracut/install.statelite
View File

@ -1,5 +1,5 @@
#!/bin/sh
echo $drivers
dracut_install wget cpio gzip dash modprobe
dracut_install wget cpio gzip dash modprobe wc
dracut_install grep ifconfig hostname awk egrep grep dirname expr
inst_hook pre-pivot 5 "$moddir/xcat-prepivot.sh"

2
xCAT-server/share/xcat/netboot/rh/genimage
View File

@ -1103,7 +1103,7 @@ EOMS
}
}
# add rsync for statelite
foreach ("bin/cpio","sbin/nash","sbin/busybox.anaconda","sbin/rmmod", "bin/bash", "usr/sbin/chroot", "sbin/mount.nfs", "/usr/bin/rsync") {
foreach ("bin/cpio","sbin/nash","sbin/busybox.anaconda","sbin/rmmod", "bin/bash", "usr/sbin/chroot", "sbin/mount.nfs", "usr/bin/rsync", "usr/bin/wc") {
getlibs($_);
push @filestoadd,$_;
}

1
xCAT-server/share/xcat/netboot/rh/genimage.rh4
View File

@ -968,6 +968,7 @@ chmod(0755,"/tmp/xcatinitrd.$$/init");
"usr/bin/dirname",
"bin/ln",
"bin/chmod",
"usr/bin/wc",
"bin/uname" # hostname will use it
);

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

@ -1045,7 +1045,7 @@ END
}
}
if($mode eq "statelite") {
foreach ("sbin/ifconfig", "usr/bin/clear", "sbin/mount.nfs","sbin/umount.nfs","bin/hostname","usr/bin/egrep","bin/ln","bin/ls","usr/bin/dirname","usr/bin/expr","usr/bin/chroot","usr/bin/grep","bin/cpio","bin/sleep","bin/mount","bin/umount","sbin/dhcpcd","bin/bash","sbin/insmod","bin/mkdir","bin/mknod","sbin/ip","bin/cat","usr/bin/awk","usr/bin/wget","bin/cp","usr/bin/cpio","usr/bin/zcat","usr/bin/gzip","lib/mkinitrd/bin/run-init","usr/bin/uniq","usr/bin/sed") {
foreach ("sbin/ifconfig", "usr/bin/clear", "sbin/mount.nfs","sbin/umount.nfs","bin/hostname","usr/bin/egrep","bin/ln","bin/ls","usr/bin/dirname","usr/bin/expr","usr/bin/chroot","usr/bin/grep","bin/cpio","bin/sleep","bin/mount","bin/umount","sbin/dhcpcd","bin/bash","sbin/insmod","bin/mkdir","bin/mknod","sbin/ip","bin/cat","usr/bin/awk","usr/bin/wget","bin/cp","usr/bin/cpio","usr/bin/zcat","usr/bin/gzip","lib/mkinitrd/bin/run-init","usr/bin/uniq","usr/bin/sed","usr/bin/wc") {
getlibs($_);
push @filestoadd,$_;
}