Attachment 93737 Details for Bug 192949

[patch] pegasos-label-amiga.patch

amiga.patch (text/plain), 2.41 KB, created by Olaf Hering on 2006-07-17 17:43:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2006-07-17 17:43:45 UTC

Size: 2.41 KB

patch

obsolete

>Index: storage/libstorage/src/Storage.h
>===================================================================
>--- storage/libstorage/src/Storage.h	(revision 31905)
>+++ storage/libstorage/src/Storage.h	(working copy)
>@@ -153,6 +153,7 @@ class Storage : public storage::StorageI
> 	static const string& arch() { return( proc_arch ); }
> 	static const string& sysfsDir() { return( sysfs_dir ); }
> 	static bool isPPCMac() { return( is_ppc_mac ); }
>+	static bool isPPCPegasos() { return( is_ppc_pegasos ); }
> 	EtcFstab* getFstab() { return fstab; }
> 	void handleLogFile( const string& name );
> 	static bool testFilesEqual( const string& n1, const string& n2 );
>@@ -1295,6 +1296,7 @@ class Storage : public storage::StorageI
> 	static string proc_arch;
> 	static string sysfs_dir;
> 	static bool is_ppc_mac;
>+	static bool is_ppc_pegasos;
> 	CCont cont;
> 	EtcFstab *fstab;
> 
>Index: storage/libstorage/src/Disk.cc
>===================================================================
>--- storage/libstorage/src/Disk.cc	(revision 31905)
>+++ storage/libstorage/src/Disk.cc	(working copy)
>@@ -900,6 +900,8 @@ string Disk::defaultLabel()
> 	ret = "sun";
>     else if( Storage::arch()=="ppc" && Storage::isPPCMac() )
> 	ret = "mac";
>+    else if( Storage::arch()=="ppc" && Storage::isPPCPegasos() )
>+	ret = "amiga";
>     y2milestone( "ret %s", ret.c_str() );
>     return( ret );
>     }
>@@ -912,6 +914,7 @@ Disk::label_info Disk::labels[] = {
> 	{ "mac", false, 64, 0 },
> 	{ "dasd", false, 3, 0 },
> 	{ "aix", false, 0, 0 },
>+	{ "amiga", false, 63, 0 },
> 	{ "", false, 0, 0 }
>     };
> 
>Index: storage/libstorage/src/Storage.cc
>===================================================================
>--- storage/libstorage/src/Storage.cc	(revision 31905)
>+++ storage/libstorage/src/Storage.cc	(working copy)
>@@ -334,9 +334,10 @@ Storage::detectArch()
> 	    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", proc_arch.c_str(), is_ppc_mac );
>+    y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos);
>     }
> 
> void
>@@ -888,6 +889,7 @@ void Storage::setDetectMountedVolumes( b
> string Storage::proc_arch;
> string Storage::sysfs_dir = "/sys/block";
> bool Storage::is_ppc_mac = false;
>+bool Storage::is_ppc_pegasos = false;
> 
> 
> namespace storage

Actions: View | Diff

Attachments on bug 192949: 93737