xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-21 18:50:28 +00:00
Code Issues Releases Wiki Activity

fix issue [FVT]on rhels6.8, rootimg.tar.gz is only 20 bytes after run packimage -m tar rhels6.8-ppc64-netboot-compute ; fix issue #1689 [FVT]:diskless provision broken using rootimg.tar.gz created by packimage -m tar osimage #1688

Browse Source
This commit is contained in:
immarvin
2016-08-13 00:30:56 -04:00
parent e1775355f5
commit 5699b025dd
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/share/xcat/netboot/rh/dracut/xcatroot
View File

@@ -106,9 +106,9 @@ elif [ -r /rootimg.tar.gz ] || [ -r /rootimg.tar.xz ]; then
cd $NEWROOT
echo -n "Extracting root filesystem:"
if [ -r /rootimg.tar.gz ]; then
tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz
tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz
elif [ -r /rootimg.tar.xz ]; then
tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz
tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz
fi
$NEWROOT/etc/init.d/localdisk
echo Done

4
xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot
View File

@@ -110,9 +110,9 @@ elif [ -r /rootimg.tar.gz ] || [ -r /rootimg.tar.xz ]; then
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Extracting root filesystem:"
echo -n "Extracting root filesystem:"
if [ -r /rootimg.tar.gz ]; then
tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz
tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz
elif [ -r /rootimg.tar.xz ]; then
tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz
tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz
fi
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."

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

@@ -1640,9 +1640,9 @@ EOMS
print $inifile " cd \$NEWROOT\n";
print $inifile " echo -n \"Extracting root filesystem:\"\n";
print $inifile " if [ -r /rootimg.tar.gz ]; then\n";
print $inifile " tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz\n";
print $inifile " tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz\n";
print $inifile " elif [ -r /rootimg.tar.xz ]; then\n";
print $inifile " tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz\n";
print $inifile " tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz\n";
print $inifile " fi\n";
print $inifile " echo Done\n";
print $inifile "else\n";

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

@@ -108,9 +108,9 @@ elif [ -r /rootimg.tar.gz ] || [ -r /rootimg.tar.xz ]; then
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Extracting root filesystem:"
echo -n "Extracting root filesystem:"
if [ -r /rootimg.tar.gz ]; then
tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz
tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz
elif [ -r /rootimg.tar.xz ]; then
tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz
tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz
fi
$NEWROOT/etc/init.d/localdisk
[ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "Done...."

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

@@ -1658,9 +1658,9 @@ EOMS
print $inifile " cd \$NEWROOT\n";
print $inifile " echo -n \"Extracting root filesystem:\"\n";
print $inifile " if [ -r /rootimg.tar.gz ]; then\n";
print $inifile " tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz\n";
print $inifile " tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz\n";
print $inifile " elif [ -r /rootimg.tar.xz ]; then\n";
print $inifile " tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz\n";
print $inifile " tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz\n";
print $inifile " fi\n";
print $inifile " echo Done\n";
print $inifile "else\n";

4
xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot
View File

@@ -64,9 +64,9 @@ elif [ -r /rootimg.tar.gz ] || [ -r /rootimg.tar.xz ]; then
cd $NEWROOT
echo -n "Extracting root filesystem:"
if [ -r /rootimg.tar.gz ]; then
tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz
tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz
elif [ -r /rootimg.tar.xz ]; then
tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz
tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz
fi
echo Done
elif [ -r /rootimg-statelite.gz ]; then

6
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@@ -1480,9 +1480,9 @@ EOMS
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"Extracting root filesystem:\"\n";
print $inifile " echo -n \"Extracting root filesystem:\"\n";
print $inifile " if [ -r /rootimg.tar.gz ]; then\n";
print $inifile " tar --selinux --xattrs-include='*' -zxvf /rootimg.tar.gz\n";
print $inifile " /bin/tar --selinux --xattrs-include='*' -zxf /rootimg.tar.gz\n";
print $inifile " elif [ -r /rootimg.tar.xz ]; then\n";
print $inifile " tar --selinux --xattrs-include='*' -Jxvf /rootimg.tar.xz\n";
print $inifile " /bin/tar --selinux --xattrs-include='*' -Jxf /rootimg.tar.xz\n";
print $inifile " fi\n";
print $inifile " ([ \"\$xcatdebugmode\" = \"1\" ] || [ \"\$xcatdebugmode\" = \"2\" ]) && logger -t xcat -p debug \"Done...\"\n";
print $inifile " echo Done\n";
@@ -1624,7 +1624,7 @@ EOMS
}
# add rsync for statelite
foreach ("usr/bin/dig", "bin/busybox", "bin/bash", "sbin/mount.nfs", "usr/bin/rsync", "sbin/insmod", "sbin/udevd", "sbin/udevadm", "sbin/modprobe", "sbin/blkid", "sbin/depmod", "usr/bin/wget", "usr/bin/xz", "usr/bin/gzip", "usr/bin/tar") {
foreach ("usr/bin/dig", "bin/busybox", "bin/bash", "sbin/mount.nfs", "usr/bin/rsync", "sbin/insmod", "sbin/udevd", "sbin/udevadm", "sbin/modprobe", "sbin/blkid", "sbin/depmod", "usr/bin/wget", "usr/bin/xz", "bin/gzip", "bin/tar") {
getlibs($_);
push @filestoadd, $_;
}