Hello community, here is the log from the commit of package yast2-storage checked in at Mon Sep 3 18:49:11 CEST 2007. -------- --- yast2-storage/yast2-storage.changes 2007-08-30 17:14:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-09-03 11:35:56.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 3 11:34:26 CEST 2007 - fehr@suse.de + +- call insserv or insser -r for boot.{md,lvm,dmraid} as needed (#303857) +- version 2.15.24 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.15.23.tar.bz2 New: ---- yast2-storage-2.15.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.m16222/_old 2007-09-03 18:48:57.000000000 +0200 +++ /var/tmp/diff_new_pack.m16222/_new 2007-09-03 18:48:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.15.23) +# spec file for package yast2-storage (Version 2.15.24) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.15.23 +Version: 2.15.24 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.15.23.tar.bz2 +Source0: yast2-storage-2.15.24.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite # Required only in inst-sys @@ -44,7 +44,7 @@ %prep -%setup -n yast2-storage-2.15.23 +%setup -n yast2-storage-2.15.24 %build %{prefix}/bin/y2tool y2autoconf @@ -171,6 +171,9 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Mon Sep 03 2007 - fehr@suse.de +- call insserv or insser -r for boot.{md,lvm,dmraid} as needed (#303857) +- version 2.15.24 * Thu Aug 30 2007 - fehr@suse.de - call insserv for boot.crypto during update from <=10.2 (#305105) - restart boot.quota if quota options have changed (#304841) ++++++ yast2-storage-2.15.23.tar.bz2 -> yast2-storage-2.15.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.23/storage/src/modules/Storage.ycp new/yast2-storage-2.15.24/storage/src/modules/Storage.ycp --- old/yast2-storage-2.15.23/storage/src/modules/Storage.ycp 2007-08-30 14:10:00.000000000 +0200 +++ new/yast2-storage-2.15.24/storage/src/modules/Storage.ycp 2007-09-03 11:36:11.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 40621 2007-08-30 12:09:59Z fehr $ + * $Id: Storage.ycp 40685 2007-09-03 09:36:11Z fehr $ */ { @@ -5593,6 +5593,22 @@ return( ret ); } +void CallInsserv( boolean on, string name ) + { + y2milestone( "CallInsserv on:%1 name:%2", on, name ); + string scrname = "/etc/init.d/boot." + name; + if( SCR::Read( .target.size, scrname )>0 ) + { + string cmd = "cd / && /sbin/insserv "; + if( !on ) + cmd = cmd + "-r "; + cmd = cmd + scrname; + y2milestone( "CallInsserv cmd %1", cmd ); + map bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "CallInsserv bo %1", bo ); + } + } + global define void FinishInstall() ``{ y2milestone( "FinishInstall initial:%1", Stage::initial() ); @@ -5603,12 +5619,7 @@ list evms = GetUsedEvmsDisks( tg ); y2milestone( "FinishInstall evms %1", evms ); if( size(evms)>0 ) - { - string cmd = "cd / && /sbin/insserv /etc/init.d/boot.evms"; - y2milestone( "FinishInstall cmd %1", cmd ); - map bo = (map)SCR::Execute (.target.bash_output, cmd ); - y2milestone( "FinishInstall bo %1", bo ); - } + CallInsserv( true, "evms" ); list<string> nonevms = GetUsedRealDisks( tg ); nonevms = filter( string d, nonevms, ``(!contains( evms, d ))); nonevms = maplist( string d, nonevms, ``(substring(d,5))); @@ -5658,19 +5669,30 @@ } } boolean need_crypt = false; + boolean need_md = false; + boolean need_lvm = false; + boolean need_dmraid = false; foreach( string k, map e, tg, ``{ if( size(filter( map p, e["partitions"]:[], ``(p["enc_type"]:`none != `none)))>0 ) need_crypt = true; - }); + if( e["type"]:`CT_UNKNOWN==`CT_MD && size(e["partitions"]:[])>0 ) + need_md = true; + if( e["type"]:`CT_UNKNOWN==`CT_LVM ) + need_lvm = true; + if( e["type"]:`CT_UNKNOWN==`CT_DMRAID ) + need_dmraid = true; + }); + y2milestone( "FinishInstall need crypto:%1 md:%2 lvm:%3 dmraid:%4", + need_crypt, need_md, need_lvm, need_dmraid ); + string cmd = ""; + map bo = $[]; if( need_crypt ) - { - string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto"; - y2milestone( "FinishInstall cmd %1", cmd ); - map bo = (map)SCR::Execute (.target.bash_output, cmd ); - y2milestone( "FinishInstall bo %1", bo ); - } + CallInsserv( true, "crypto" ); + CallInsserv( need_md, "md" ); + CallInsserv( need_lvm, "lvm" ); + CallInsserv( need_dmraid, "dmraid" ); y2milestone( "FinishInstall done" ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.23/VERSION new/yast2-storage-2.15.24/VERSION --- old/yast2-storage-2.15.23/VERSION 2007-08-30 17:14:39.000000000 +0200 +++ new/yast2-storage-2.15.24/VERSION 2007-09-03 11:35:42.000000000 +0200 @@ -1 +1 @@ -2.15.23 +2.15.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org