diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot index 4d20531fa..367625618 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot +++ b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot @@ -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 diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot index 0bc2ebcd9..58a33895e 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot +++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot @@ -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...." diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage index aa13d2855..bc5104c41 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage +++ b/xCAT-server/share/xcat/netboot/rh/genimage @@ -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"; diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot b/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot index acd7b3ebf..b12eb9a3f 100755 --- a/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot +++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot @@ -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...." diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage index 3fbe3c6c2..23ca97d2c 100755 --- a/xCAT-server/share/xcat/netboot/sles/genimage +++ b/xCAT-server/share/xcat/netboot/sles/genimage @@ -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"; diff --git a/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot b/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot index 67f40c8ed..2c76d7690 100755 --- a/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot +++ b/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot @@ -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 diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage index 8934e44b1..e2ba372f0 100755 --- a/xCAT-server/share/xcat/netboot/ubuntu/genimage +++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage @@ -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, $_; }