From 2bf5dc57f9da2b72e80106026dd13f71774ff476 Mon Sep 17 00:00:00 2001 From: yangsong Date: Thu, 10 May 2018 16:26:42 +0800 Subject: [PATCH] [CUSTOMER] Ping not working for non root users on Diskless PowerKVM guests (rhels7.2) #922: use tar as the default archive method instead of cpio (#5187) --- docs/source/guides/admin-guides/references/man1/packimage.1.rst | 2 +- xCAT-client/pods/man1/packimage.1.pod | 2 +- xCAT-server/lib/xcat/plugins/packimage.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/packimage.1.rst b/docs/source/guides/admin-guides/references/man1/packimage.1.rst index f7f1ff332..c01796d46 100644 --- a/docs/source/guides/admin-guides/references/man1/packimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/packimage.1.rst @@ -53,7 +53,7 @@ OPTIONS \ **-v**\ Command Version. -\ **-m| -**\ **-method**\ Archive Method (cpio,tar,squashfs, default is cpio) +\ **-m| -**\ **-method**\ Archive Method (cpio,tar,squashfs, default is tar) \ **-c| -**\ **-compress**\ Compress Method (pigz,gzip,xz, default is pigz/gzip) diff --git a/xCAT-client/pods/man1/packimage.1.pod b/xCAT-client/pods/man1/packimage.1.pod index 5b2b2a837..36b0f8f1f 100644 --- a/xCAT-client/pods/man1/packimage.1.pod +++ b/xCAT-client/pods/man1/packimage.1.pod @@ -27,7 +27,7 @@ B<-h> Display usage message. B<-v> Command Version. -B<-m| --method> Archive Method (cpio,tar,squashfs, default is cpio) +B<-m| --method> Archive Method (cpio,tar,squashfs, default is tar) B<-c| --compress> Compress Method (pigz,gzip,xz, default is pigz/gzip) diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm index f12bda2cf..db5d157dc 100755 --- a/xCAT-server/lib/xcat/plugins/packimage.pm +++ b/xCAT-server/lib/xcat/plugins/packimage.pm @@ -89,7 +89,7 @@ sub process_request { my $osver; my $arch; my $profile; - my $method = 'cpio'; + my $method = 'tar'; my $compress; my $exlistloc; my $syncfile;