Attachment #99624 for bug #141461

View | Details | Raw Unified | Return to bug 141461
Collapse All | Expand All




	    line = extractNthWord( 2, line );
	    y2milestone( "line:%s", line.c_str() );
	    is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
	    if( is_ppc_mac == 0)
		{
		line = cpu[l];
		line = extractNthWord( 3, line );
		y2milestone( "line:%s", line.c_str() );
		is_ppc_pegasos = line.find( "Pegasos" )==0;
		}
	    }
	}
    y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos:%d", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos );
    }

void

string Storage::proc_arch;
string Storage::sysfs_dir = "/sys/block";
bool Storage::is_ppc_mac = false;
bool Storage::is_ppc_pegasos = false;


namespace storage

Lines 215-220 class Storage : public storage::StorageI Link Here

(-)yast2-storage-2.14.5/libstorage/src/Storage.h (+2 lines)
215	static const string& arch() { return( proc_arch ); }	215	static const string& arch() { return( proc_arch ); }
216	static const string& sysfsDir() { return( sysfs_dir ); }	216	static const string& sysfsDir() { return( sysfs_dir ); }
217	static bool isPPCMac() { return( is_ppc_mac ); }	217	static bool isPPCMac() { return( is_ppc_mac ); }
		218	static bool isPPCPegasos() { return( is_ppc_pegasos ); }
218	EtcFstab* getFstab() { return fstab; }	219	EtcFstab* getFstab() { return fstab; }
219	void handleLogFile( const string& name );	220	void handleLogFile( const string& name );
220	static bool testFilesEqual( const string& n1, const string& n2 );	221	static bool testFilesEqual( const string& n1, const string& n2 );
Lines 1614-1619 class Storage : public storage::StorageI Link Here
1614	static string proc_arch;	1615	static string proc_arch;
1615	static string sysfs_dir;	1616	static string sysfs_dir;
1616	static bool is_ppc_mac;	1617	static bool is_ppc_mac;
		1618	static bool is_ppc_pegasos;
1617	CCont cont;	1619	CCont cont;
1618	EtcFstab *fstab;	1620	EtcFstab *fstab;
1619		1621

Return to bug 141461

Lines 347-355 Storage::detectArch() Link Here

(-)yast2-storage-2.14.5/libstorage/src/Storage.cc (-1 / +9 lines)
347	line = extractNthWord( 2, line );	347	line = extractNthWord( 2, line );
348	y2milestone( "line:%s", line.c_str() );	348	y2milestone( "line:%s", line.c_str() );
349	is_ppc_mac = line.find( "PowerMac" )==0 \|\| line.find( "PowerBook" )==0;	349	is_ppc_mac = line.find( "PowerMac" )==0 \|\| line.find( "PowerBook" )==0;
		350	if( is_ppc_mac == 0)
		351	{
		352	line = cpu[l];
		353	line = extractNthWord( 3, line );
		354	y2milestone( "line:%s", line.c_str() );
		355	is_ppc_pegasos = line.find( "Pegasos" )==0;
		356	}
350	}	357	}
351	}	358	}
352	y2milestone( "Arch:%s IsPPCMac:%d", proc_arch.c_str(), is_ppc_mac );	359	y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos:%d", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos );
353	}	360	}
354		361
355	void	362	void
Lines 938-943 void Storage::setDetectMountedVolumes( b Link Here
938	string Storage::proc_arch;	945	string Storage::proc_arch;
939	string Storage::sysfs_dir = "/sys/block";	946	string Storage::sysfs_dir = "/sys/block";
940	bool Storage::is_ppc_mac = false;	947	bool Storage::is_ppc_mac = false;
		948	bool Storage::is_ppc_pegasos = false;
941		949
942		950
943	namespace storage	951	namespace storage