Author: aschnell Date: Thu Aug 7 22:38:04 2008 New Revision: 49842 URL: http://svn.opensuse.org/viewcvs/yast?rev=49842&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/StorageDefines.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Aug 7 22:38:04 2008 @@ -2284,13 +2284,13 @@ { string cmd; SystemCmd c; - cmd = "dd if=/dev/zero of=" + quote(p->device()) + " bs=1k count=200"; + cmd = DDBIN " if=/dev/zero of=" + quote(p->device()) + " bs=1k count=200"; c.execute( cmd ); unsigned long long pos = p->sizeK(); if( pos>200 ) { pos -= 200; - cmd = "dd if=/dev/zero of=" + p->device() + + cmd = DDBIN " if=/dev/zero of=" + quote(p->device()) + " seek=" + decString(pos) + " bs=1k count=10"; c.execute( cmd ); } Modified: trunk/storage/libstorage/src/Loop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Loop.cc?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/Loop.cc (original) +++ trunk/storage/libstorage/src/Loop.cc Thu Aug 7 22:38:04 2008 @@ -13,6 +13,7 @@ #include "y2storage/ProcPart.h" #include "y2storage/Storage.h" #include "y2storage/SystemCmd.h" +#include "y2storage/StorageDefines.h" using namespace storage; using namespace std; @@ -182,7 +183,7 @@ y2mil( "pa:" << pa ); createPath( pa ); } - string cmd = "dd if=/dev/zero of=" + quote(lfileRealPath()); + string cmd = DDBIN " if=/dev/zero of=" + quote(lfileRealPath()); cmd += " bs=1k count=" + decString( sizeK() ); SystemCmd c( cmd ); ret = c.retcode()==0; Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Thu Aug 7 22:38:04 2008 @@ -1344,7 +1344,7 @@ cmd = PARTEDCMD + quote(device) + " mklabel msdos"; c.execute( cmd ); } - cmd = "echo y | " PVCREATEBIN " -ff " + metaString() + device; + cmd = "echo y | " PVCREATEBIN " -ff " + metaString() + quote(device); c.execute( cmd ); if( c.retcode()!=0 ) { Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Thu Aug 7 22:38:04 2008 @@ -629,9 +629,9 @@ { string cmd; SystemCmd c; - cmd = "dd if=/dev/zero of=" + quote(m->device()) + " bs=1k count=200"; + cmd = DDBIN " if=/dev/zero of=" + quote(m->device()) + " bs=1k count=200"; c.execute( cmd ); - cmd = "dd if=/dev/zero of=" + quote(m->device()) + + cmd = DDBIN " if=/dev/zero of=" + quote(m->device()) + " seek=" + decString(m->sizeK()-10) + " bs=1k count=10"; c.execute( cmd ); Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMounts.cc?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Thu Aug 7 22:38:04 2008 @@ -10,6 +10,7 @@ #include "y2storage/ProcMounts.h" #include "y2storage/StorageTmpl.h" #include "y2storage/Storage.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -23,7 +24,7 @@ ifstream mounts( "/proc/mounts" ); string line; getline( mounts, line ); - SystemCmd mt( "mount" ); + SystemCmd mt(MOUNTBIN); while( mounts.good() ) { string dev = extractNthWord( 0, line ); Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDefines.h?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Thu Aug 7 22:38:04 2008 @@ -32,5 +32,7 @@ #define SWAPONBIN "/sbin/swapon" #define SWAPOFFBIN "/sbin/swapoff" +#define DDBIN "/bin/dd" + #endif Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=49842&r1=49841&r2=49842&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Aug 7 22:38:04 2008 @@ -691,7 +691,7 @@ (Storage::arch().find( "sparc" )!=0 || encryption!=ENC_NONE )) { SystemCmd c; - string cmd = "/bin/dd if="; + string cmd = DDBIN " if="; cmd += (encryption!=ENC_NONE) ? "/dev/urandom" : "/dev/zero"; cmd += " of=" + quote(mountDevice()) + " bs=1024 count="; cmd += decString(min(200ull,size_k)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org