xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6687 from gurevichmark/squashfs3

Browse Source 
Testcase and genimage fixes for squashfs
This commit is contained in:
cxhong
2020-05-01 14:44:12 -04:00
committed by GitHub
parent 8bf0a31022 f7dbd08b96
commit 5df4a86ce9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot
View File

@ -65,7 +65,6 @@ if [ -r /rootimg.sfs ]; then
mkdir -p /rw
mount -t squashfs /rootimg.sfs /ro
mount -t tmpfs rw /rw
mount -t aufs -o dirs=/rw:/ro mergedroot $NEWROOT
modinfo overlay
if [ $? -eq 0 ]; then
echo "Mounting $NEWROOT with type overlay"
@ -75,6 +74,7 @@ if [ -r /rootimg.sfs ]; then
mount -t overlay -o lowerdir=/ro,upperdir=/rw/upper,workdir=/rw/work mergedroot $NEWROOT
else
echo "Mounting $NEWROOT with type aufs"
mount -t aufs -o dirs=/rw:/ro mergedroot $NEWROOT
mkdir -p $NEWROOT/ro
mkdir -p $NEWROOT/rw
mount --move /ro $NEWROOT/ro

6
xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat
View File

@ -131,13 +131,13 @@ check:rc==0
cmd:rm -rf /tmp/mountoutput
#Make sure squashfs-tools rpm is installed on RHEL
cmd:if [ "$$OS" =~ "rhel" ];then yum install -y squashfs-tools; fi
cmd:if [[ "$$OS" =~ "rhel" ]]; then yum install -y squashfs-tools; fi
#Make sure squashfs-tools rpm is installed on Ubuntu
cmd:if [ "$$OS" =~ "ubuntu" ];then apt-get install -y squashfs-tools; fi
cmd:if [[ "$$OS" =~ "ubuntu" ]]; then apt-get install -y squashfs-tools; fi
#Make sure squashfs rpm is installed on SLES
cmd:if [ "$$OS" =~ "sle" ];then zypper install -y squashfs; fi
cmd:if [[ "$$OS" =~ "sle" ]]; then zypper install -y squashfs; fi
cmd:packimage -m squashfs __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
check:rc==0

6
xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy
View File

@ -154,13 +154,13 @@ cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-comput
check:rc==0
#Make sure squashfs-tools rpm is installed on RHEL
cmd:if [ "$$OS" =~ "rhel" ];then yum install -y squashfs-tools; fi
cmd:if [[ "$$OS" =~ "rhel" ]]; then yum install -y squashfs-tools; fi
#Make sure squashfs-tools rpm is installed on Ubuntu
cmd:if [ "$$OS" =~ "ubuntu" ];then apt-get install -y squashfs-tools; fi
cmd:if [[ "$$OS" =~ "ubuntu" ]]; then apt-get install -y squashfs-tools; fi
#Make sure squashfs rpm is installed on SLES
cmd:if [ "$$OS" =~ "sle" ];then zypper install -y squashfs; fi
cmd:if [[ "$$OS" =~ "sle" ]]; then zypper install -y squashfs; fi
cmd:packimage -m squashfs __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
check:rc==0