Attachment 99624 Details for Bug 141461

[patch] yast2-storage.amiga.isPPCPegasos.patch

yast2-storage.amiga.isPPCPegasos.patch (text/plain), 2.05 KB, created by Olaf Hering on 2006-09-26 12:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2006-09-26 12:52:06 UTC

Size: 2.05 KB

patch

obsolete

>add a function to detect Pegasos
>---
> libstorage/src/Storage.cc |   10 +++++++++-
> libstorage/src/Storage.h  |    2 ++
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
>Index: yast2-storage-2.14.5/libstorage/src/Storage.cc
>===================================================================
>--- yast2-storage-2.14.5.orig/libstorage/src/Storage.cc
>+++ yast2-storage-2.14.5/libstorage/src/Storage.cc
>@@ -347,9 +347,16 @@ Storage::detectArch()
> 	    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", proc_arch.c_str(), is_ppc_mac );
>+    y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos:%d", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos );
>     }
> 
> void
>@@ -938,6 +945,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
>Index: yast2-storage-2.14.5/libstorage/src/Storage.h
>===================================================================
>--- yast2-storage-2.14.5.orig/libstorage/src/Storage.h
>+++ yast2-storage-2.14.5/libstorage/src/Storage.h
>@@ -215,6 +215,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 );
>@@ -1614,6 +1615,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;
>

Actions: View | Diff

Attachments on bug 141461: 94888 | 94889 | 99624 | 99625 | 99626 | 99718