Mailinglist Archive: opensuse-commit (832 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package libstorage for openSUSE:Factory
checked in at Thu Feb 18 16:31:33 CET 2010.



--------
--- libstorage/libstorage.changes       2010-02-11 20:59:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes  2010-02-16 
11:11:24.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Feb 16 10:52:00 CET 2010 - aschnell@xxxxxxx
+
+- fixed seg. fault during installation with MD RAIDs
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.AD9KPC/_old  2010-02-18 15:55:13.000000000 +0100
+++ /var/tmp/diff_new_pack.AD9KPC/_new  2010-02-18 15:55:13.000000000 +0100
@@ -20,7 +20,7 @@
 
 Name:           libstorage
 Version:        2.19.9
-Release:        1
+Release:        2
 License:        GPL
 Group:          System/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ libstorage-2.19.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libstorage-2.19.9/examples/TestDisk.cc 
new/libstorage-2.19.9/examples/TestDisk.cc
--- old/libstorage-2.19.9/examples/TestDisk.cc  2010-02-08 17:02:41.000000000 
+0100
+++ new/libstorage-2.19.9/examples/TestDisk.cc  2010-02-09 11:58:40.000000000 
+0100
@@ -12,7 +12,7 @@
     int ret;
     initDefaultLogger();
     StorageInterface* s = createStorageInterface(Environment(false));
-    string disk = "/dev/sdb";
+    string disk = "/dev/hdb";
     string dev;
     ret = s->destroyPartitionTable( disk, s->defaultDiskLabel() );
     if( ret ) cerr << "retcode:" << ret << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libstorage-2.19.9/examples/TestDiskLog.cc 
new/libstorage-2.19.9/examples/TestDiskLog.cc
--- old/libstorage-2.19.9/examples/TestDiskLog.cc       2010-02-08 
17:02:41.000000000 +0100
+++ new/libstorage-2.19.9/examples/TestDiskLog.cc       2010-02-09 
11:58:40.000000000 +0100
@@ -14,16 +14,16 @@
     initDefaultLogger();
     StorageInterface* s = createStorageInterface(Environment(false));
     string dev;
-    ret = s->destroyPartitionTable( "/dev/sdb", s->defaultDiskLabel() );
+    ret = s->destroyPartitionTable( "/dev/hdb", s->defaultDiskLabel() );
     if( ret ) cerr << "retcode:" << ret << endl;
-    ret = s->createPartitionKb( "/dev/sdb", EXTENDED, 5000*1024, 15000*1024, 
dev );
+    ret = s->createPartitionKb( "/dev/hdb", EXTENDED, 5000*1024, 15000*1024, 
dev );
     cout << dev << endl;
     if( ret ) cerr << "retcode:" << ret << endl;
-    unsigned kb = s->cylinderToKb( "/dev/sdb", 40 );
+    unsigned kb = s->cylinderToKb( "/dev/hdb", 40 );
     int i=0;
     while( i<40 && ret==0 )
        {
-       ret = s->createPartitionKb( "/dev/sdb", LOGICAL, 5000*1024+i*kb, kb, 
+       ret = s->createPartitionKb( "/dev/hdb", LOGICAL, 5000*1024+i*kb, kb, 
                                    dev );
        if(ret==0) cout << dev << endl;
        i++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libstorage-2.19.9/storage/Disk.cc 
new/libstorage-2.19.9/storage/Disk.cc
--- old/libstorage-2.19.9/storage/Disk.cc       2010-02-10 12:07:16.000000000 
+0100
+++ new/libstorage-2.19.9/storage/Disk.cc       2010-02-10 21:44:51.000000000 
+0100
@@ -2156,10 +2156,10 @@
            y2mil( "p1:" << start_p << " p2:" << size_p );
            std::ifstream fl;
            classic(fl);
-           fl.open( start_p );
+           fl.open( start_p.c_str() );
            fl >> sysfs_start;
            fl.close();
-           fl.open( size_p );
+           fl.open( size_p.c_str() );
            fl >> sysfs_size;
            fl.close();
            if( p->type()==EXTENDED )
@@ -2173,10 +2173,10 @@
                {
                callDelpart( nr );
                callAddpart( nr, sstart, ssize );
-               fl.open( start_p );
+               fl.open( start_p.c_str() );
                fl >> sysfs_start;
                fl.close();
-               fl.open( size_p );
+               fl.open( size_p.c_str() );
                fl >> sysfs_size;
                fl.close();
                if( sysfs_start!=sstart || sysfs_size!=ssize )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libstorage-2.19.9/storage/MdCo.cc 
new/libstorage-2.19.9/storage/MdCo.cc
--- old/libstorage-2.19.9/storage/MdCo.cc       2010-01-28 15:03:54.000000000 
+0100
+++ new/libstorage-2.19.9/storage/MdCo.cc       2010-02-16 10:48:15.000000000 
+0100
@@ -83,22 +83,32 @@
     }
 
 
-void
-MdCo::syncRaidtab()
+    void
+    MdCo::syncRaidtab()
     {
-    MdPair p=mdPair(Md::notDeleted);
-    for( MdIter i=p.begin(); i!=p.end(); ++i )
+       EtcRaidtab* tab = getStorage()->getRaidtab();
+       if (tab)
        {
-           i->updateEntry(getStorage()->getRaidtab());
+           MdPair p = mdPair(Md::notDeleted);
+           for (MdIter i = p.begin(); i!=p.end(); ++i)
+           {
+               i->updateEntry(tab);
+           }
        }
     }
 
-void MdCo::updateEntry( const Md* m )
+
+    void
+    MdCo::updateEntry(const Md* m)
     {
        EtcRaidtab* tab = getStorage()->getRaidtab();
-       tab->updateEntry(m->nr(), m->mdadmLine());
+       if (tab)
+       {
+           tab->updateEntry(m->nr(), m->mdadmLine());
+       }
     }
 
+
 void
 MdCo::getMdData()
     {
@@ -693,7 +703,7 @@
        if( ret==0 )
            {
            EtcRaidtab* tab = getStorage()->getRaidtab();
-           if( tab!=NULL )
+           if (tab)
                {
                tab->removeEntry( m->nr() );
                }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libstorage-2.19.9/storage/MdPartCo.cc 
new/libstorage-2.19.9/storage/MdPartCo.cc
--- old/libstorage-2.19.9/storage/MdPartCo.cc   2010-02-10 12:07:16.000000000 
+0100
+++ new/libstorage-2.19.9/storage/MdPartCo.cc   2010-02-16 10:49:21.000000000 
+0100
@@ -966,7 +966,7 @@
       if( ret==0 )
         {
         EtcRaidtab* tab = getStorage()->getRaidtab();
-        if( tab!=NULL )
+        if (tab)
           {
           tab->removeEntry( nr() );
           }
@@ -1944,6 +1944,8 @@
     }
   return -1;
 }
+
+
 void MdPartCo::updateEntry()
     {
     EtcRaidtab* tab = getStorage()->getRaidtab();
@@ -1975,10 +1977,10 @@
       }
     }
 
+
 string MdPartCo::mdadmLine() const
     {
-    string line = "ARRAY " + device() + " level=" + pName();
-    line += " UUID=" + md_uuid;
+    string line = "ARRAY " + device() + " level=" + pName() + " UUID=" + 
md_uuid;
     y2mil("line:" << line);
     return( line );
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libstorage-2.19.9/storage/MdPartCo.h 
new/libstorage-2.19.9/storage/MdPartCo.h
--- old/libstorage-2.19.9/storage/MdPartCo.h    2010-02-10 12:07:16.000000000 
+0100
+++ new/libstorage-2.19.9/storage/MdPartCo.h    2010-02-09 17:39:30.000000000 
+0100
@@ -154,7 +154,7 @@
     static bool matchRegex( const string& dev );
     static bool mdStringNum( const string& name, unsigned& num );
 
-    // This function will scann for MD RAIDs and will return
+    // This function will scan for MD RAIDs and will return
     // list with detected RAID names.
     static int scanForRaid(list<string>& raidNames);
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx