Attachment #93737 for bug #192949

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

Lines 153-158 class Storage : public storage::StorageI Link Here

(-)storage/libstorage/src/Storage.h (+2 lines)
153	static const string& arch() { return( proc_arch ); }	153	static const string& arch() { return( proc_arch ); }
154	static const string& sysfsDir() { return( sysfs_dir ); }	154	static const string& sysfsDir() { return( sysfs_dir ); }
155	static bool isPPCMac() { return( is_ppc_mac ); }	155	static bool isPPCMac() { return( is_ppc_mac ); }
		156	static bool isPPCPegasos() { return( is_ppc_pegasos ); }
156	EtcFstab* getFstab() { return fstab; }	157	EtcFstab* getFstab() { return fstab; }
157	void handleLogFile( const string& name );	158	void handleLogFile( const string& name );
158	static bool testFilesEqual( const string& n1, const string& n2 );	159	static bool testFilesEqual( const string& n1, const string& n2 );
Lines 1295-1300 class Storage : public storage::StorageI Link Here
1295	static string proc_arch;	1296	static string proc_arch;
1296	static string sysfs_dir;	1297	static string sysfs_dir;
1297	static bool is_ppc_mac;	1298	static bool is_ppc_mac;
		1299	static bool is_ppc_pegasos;
1298	CCont cont;	1300	CCont cont;
1299	EtcFstab *fstab;	1301	EtcFstab *fstab;
1300		1302

Lines 900-905 string Disk::defaultLabel() Link Here

(-)storage/libstorage/src/Disk.cc (+3 lines)
900	ret = "sun";	900	ret = "sun";
901	else if( Storage::arch()=="ppc" && Storage::isPPCMac() )	901	else if( Storage::arch()=="ppc" && Storage::isPPCMac() )
902	ret = "mac";	902	ret = "mac";
		903	else if( Storage::arch()=="ppc" && Storage::isPPCPegasos() )
		904	ret = "amiga";
903	y2milestone( "ret %s", ret.c_str() );	905	y2milestone( "ret %s", ret.c_str() );
904	return( ret );	906	return( ret );
905	}	907	}
Lines 912-917 Disk::label_info Disk::labels[] = { Link Here
912	{ "mac", false, 64, 0 },	914	{ "mac", false, 64, 0 },
913	{ "dasd", false, 3, 0 },	915	{ "dasd", false, 3, 0 },
914	{ "aix", false, 0, 0 },	916	{ "aix", false, 0, 0 },
		917	{ "amiga", false, 63, 0 },
915	{ "", false, 0, 0 }	918	{ "", false, 0, 0 }
916	};	919	};
917		920




	    line = extractNthWord( 2, line );
	    y2milestone( "line:%s", line.c_str() );
	    is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
	    is_ppc_pegasos = line.find( "Pegasos" )==0;
	    }
	}
    y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos", 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

Return to bug 192949

Lines 334-342 Storage::detectArch() Link Here

(-)storage/libstorage/src/Storage.cc (-1 / +3 lines)
334	line = extractNthWord( 2, line );	334	line = extractNthWord( 2, line );
335	y2milestone( "line:%s", line.c_str() );	335	y2milestone( "line:%s", line.c_str() );
336	is_ppc_mac = line.find( "PowerMac" )==0 \|\| line.find( "PowerBook" )==0;	336	is_ppc_mac = line.find( "PowerMac" )==0 \|\| line.find( "PowerBook" )==0;
		337	is_ppc_pegasos = line.find( "Pegasos" )==0;
337	}	338	}
338	}	339	}
339	y2milestone( "Arch:%s IsPPCMac:%d", proc_arch.c_str(), is_ppc_mac );	340	y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos);
340	}	341	}
341		342
342	void	343	void
Lines 888-893 void Storage::setDetectMountedVolumes( b Link Here
888	string Storage::proc_arch;	889	string Storage::proc_arch;
889	string Storage::sysfs_dir = "/sys/block";	890	string Storage::sysfs_dir = "/sys/block";
890	bool Storage::is_ppc_mac = false;	891	bool Storage::is_ppc_mac = false;
		892	bool Storage::is_ppc_pegasos = false;
891		893
892		894
893	namespace storage	895	namespace storage