Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Oct 25 02:23:44 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-10-02 19:22:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-10-23 12:53:02.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Oct 23 12:50:10 CEST 2007 - fehr@suse.de
+
+- make StorageDevice initializion delayed (#335582)
+- version 2.16.1
+
+-------------------------------------------------------------------
+Wed Oct 10 17:25:18 CEST 2007 - fehr@suse.de
+
+- if ntfs-3g mount fails during install just use a ntfs mount
+ to prevent failing of installation in such a case (#331804)
+
+-------------------------------------------------------------------
@@ -4,0 +17 @@
+- version 2.16.0
@@ -18 +30,0 @@
-- version 2.16.0
Old:
----
yast2-storage-2.16.0.tar.bz2
New:
----
yast2-storage-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.t28712/_old 2007-10-25 02:21:42.000000000 +0200
+++ /var/tmp/diff_new_pack.t28712/_new 2007-10-25 02:21:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.16.0)
+# spec file for package yast2-storage (Version 2.16.1)
#
# 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.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.16.0.tar.bz2
+Source0: yast2-storage-2.16.1.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.16.0
+%setup -n yast2-storage-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,8 +173,15 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Tue Oct 23 2007 - fehr@suse.de
+- make StorageDevice initializion delayed (#335582)
+- version 2.16.1
+* Wed Oct 10 2007 - fehr@suse.de
+- if ntfs-3g mount fails during install just use a ntfs mount
+ to prevent failing of installation in such a case (#331804)
* Tue Oct 02 2007 - aschnell@suse.de
- fixed compiling with gcc 4.3
+- version 2.16.0
* Thu Sep 27 2007 - fehr@suse.de
- fix wrong display of cryptotab instead of fstab
- suppress install media when reading fstab (#327571)
@@ -182,7 +189,6 @@
- allow also device, uuid and label as default mount-by in
/etc/sysconfig/storage
- make warning at start of yast2 disk suppressible
-- version 2.16.0
* Mon Sep 24 2007 - fehr@suse.de
- prevent crash with invalid dmraid data (#327342)
- fix problem with removing cached mapping data (#327717)
++++++ yast2-storage-2.16.0.tar.bz2 -> yast2-storage-2.16.1.tar.bz2 ++++++
++++ 17921 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/configure.in new/yast2-storage-2.16.1/configure.in
--- old/yast2-storage-2.16.0/configure.in 2007-09-26 17:34:51.000000000 +0200
+++ new/yast2-storage-2.16.1/configure.in 2007-08-28 15:50:45.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.16.0, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.15.22, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.0"
+VERSION="2.15.22"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/libstorage/src/Volume.cc new/yast2-storage-2.16.1/libstorage/src/Volume.cc
--- old/yast2-storage-2.16.0/libstorage/src/Volume.cc 2007-09-25 11:40:26.000000000 +0200
+++ new/yast2-storage-2.16.1/libstorage/src/Volume.cc 2007-10-10 17:28:02.000000000 +0200
@@ -1128,7 +1128,11 @@
ret = checkDevice(mountDevice());
}
if( ret==0 )
+ {
ret = mount( lmount );
+ if( ret!=0 && cont->getStorage()->instsys() && fs==NTFS )
+ ret = mount( lmount, true );
+ }
}
if( ret==0 )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/missing new/yast2-storage-2.16.1/missing
--- old/yast2-storage-2.16.0/missing 2007-09-26 17:35:05.000000000 +0200
+++ new/yast2-storage-2.16.1/missing 2007-08-28 15:51:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/pluglib-bindings.ami new/yast2-storage-2.16.1/pluglib-bindings.ami
--- old/yast2-storage-2.16.0/pluglib-bindings.ami 2007-09-26 17:34:51.000000000 +0200
+++ new/yast2-storage-2.16.1/pluglib-bindings.ami 2007-08-28 15:50:47.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: pluglib-bindings.ami 27327 2006-01-25 14:12:13Z mvidner $
+# $Id: pluglib-bindings.ami 35906 2007-02-06 15:26:47Z mvidner $
# Wraps a pluglib for use by YaST. Done by using Swig for Perl, adding
# type information. Compiles, installs.
@@ -43,7 +43,9 @@
if test -d $(PLUGLIB_MODULE); then \
rm -f $(PLUGLIB_MODULE)/*.pm; \
fi
- sabcmd $(PLGB_TYPEINFO_XSL) $< | perl $(PLGB_TYPEINFO_FILTER)
+ sabcmd $(PLGB_TYPEINFO_XSL) $< > $*.tpi
+ perl $(PLGB_TYPEINFO_FILTER) < $*.tpi
+ rm $*.tpi
# Install the Perl modules
PLGB_PMdir = $(moduledir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/README new/yast2-storage-2.16.1/README
--- old/yast2-storage-2.16.0/README 2007-10-02 19:23:55.000000000 +0200
+++ new/yast2-storage-2.16.1/README 2007-10-24 16:30:15.000000000 +0200
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYING for license terms
+See the file COPYRIGHT.english for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/storage/src/modules/StorageDevices.ycp new/yast2-storage-2.16.1/storage/src/modules/StorageDevices.ycp
--- old/yast2-storage-2.16.0/storage/src/modules/StorageDevices.ycp 2007-06-27 14:12:01.000000000 +0200
+++ new/yast2-storage-2.16.1/storage/src/modules/StorageDevices.ycp 2007-10-23 12:51:49.000000000 +0200
@@ -14,7 +14,7 @@
* - removable drives (ZIP)
* - floppy devices
*
- * $Id: StorageDevices.ycp 37852 2007-05-07 11:57:22Z fehr $
+ * $Id: StorageDevices.ycp 41520 2007-10-23 10:51:49Z fehr $
*
* Author:
* Klaus Kaempf (initial)
@@ -45,31 +45,25 @@
* @return map of $["device": $[..target..], ...] for each ZIP drive
*
*/
- global map ZipDrives = $[];
+ map zip_drives = nil;
/**
* @return list of maps: all kinds of removable media, esp. ZIP drives
- * @see: FloppyDevice
- * @see: FloppyReady
*/
- global list<map> FloppyDrives = [];
+ list<map> floppy_drives = nil;
/**
* @return true if floppy drive present
- * @see: FloppyDevice
- * @see: FloppyReady
*/
- global boolean FloppyPresent = false;
+ boolean floppy_present = nil;
/**
* @return Device name of floppy, empty string if no floppy present
- * @see: FloppyPresent
- * @see: FloppyReady
*/
- global string FloppyDevice = ""; // set in constructor
+ string floppy_device = nil;
//---------------------------------------------------------------
@@ -77,13 +71,13 @@
/**
* list of cd-rom drives
*/
- global list<map> cddrives = [];
+ list<map> cd_drives = nil;
global list<string> TypeNames = [ "cdrom", "dvd", "cdrecorder", "dvdrecorder",
"dvdram" ];
// storage for localProbe, see Probe()
- map targetMap = $[];
+ integer targetMapSize = 0;
//---------------------------------------------------------------
@@ -109,8 +103,6 @@
}
-
-
/**
*
#include "storage/routines.ycp";
@@ -226,33 +218,33 @@
}
}
y2milestone( "AddAlternateLinks ret %1", cddrives );
- return( cddrives );
+ return( cd_drives );
}
/**
* ProbeCDROMs()
*
- * Initialize cddrives
+ * Initialize cd_drives
*
*/
global define boolean ProbeCDROMs()
``{
- if (size (cddrives) == 0)
+ if( cd_drives==nil )
{
- if (Stage::initial () || Stage::cont ())
+ cd_drives = [];
+ if (Stage::initial() || Stage::cont())
{
y2milestone( "before SCR::Read (.probe.cdrom)" );
- cddrives = (list<map>) SCR::Read (.probe.cdrom);
+ cd_drives = (list<map>) SCR::Read (.probe.cdrom);
y2milestone( "after SCR::Read (.probe.cdrom)" );
// write out data for hardware status check
- foreach (map drive, cddrives,
+ foreach (map drive, cd_drives,
``{
HwStatus::Set (drive["unique_key"]:"", `yes);
});
}
else
{
- cddrives = [];
y2milestone( "before SCR::Read (.probe.cdrom)" );
foreach(map e, (list<map>) SCR::Read (.probe.cdrom),
``{
@@ -261,18 +253,18 @@
y2milestone( "ProbeCDROMs cd:%1", e );
if( conf["available"]:`no != `no )
{
- cddrives = add( cddrives, e );
+ cd_drives = add( cd_drives, e );
}
});
- if ((cddrives == nil) || (size (cddrives) == 0))
+ if ((cd_drives == nil) || (size (cd_drives) == 0))
{
- cddrives = [ $["dev_name":"/dev/cdrom"] ];
+ cd_drives = [ $["dev_name":"/dev/cdrom"] ];
}
}
// sort out idecdrws and scsicds
- foreach (map e, cddrives,
+ foreach (map e, cd_drives,
``{
if( (e["cdr"]:false || e["cdrw"]:false || e["dvdr"]:false ) &&
e["bus"]:"" == "IDE" )
@@ -290,39 +282,46 @@
if( boot_device != "" )
{
- y2milestone( "ProbeCDROMs cddrives:%1", cddrives );
+ y2milestone( "ProbeCDROMs cddrives:%1", cd_drives );
y2milestone( "ProbeCDROMs boot_device:%1", boot_device );
if( search( boot_device, "/dev/" ) != 0 )
boot_device = "/dev/" + boot_device;
- list tmp = filter( map e, cddrives, ``(e["dev_name"]:""==boot_device));
+ list tmp = filter( map e, cd_drives, ``(e["dev_name"]:""==boot_device));
if( size(tmp)>0 )
{
- cddrives = filter( map e, cddrives, ``(e["dev_name"]:""!=boot_device));
- cddrives = (list<map>)merge( tmp, cddrives );
+ cd_drives = filter( map e, cd_drives, ``(e["dev_name"]:""!=boot_device));
+ cd_drives = (list<map>)merge( tmp, cd_drives );
}
- y2milestone( "ProbeCDROMs cddrives:%1", cddrives );
+ y2milestone( "ProbeCDROMs cddrives:%1", cd_drives );
}
- y2milestone( "ProbeCDROMs cddrives:%1", cddrives );
- cddrives = AddNormalLinknames( cddrives );
- cddrives = maplist( map drive, cddrives,
+ y2milestone( "ProbeCDROMs cddrives:%1", cd_drives );
+ cd_drives = AddNormalLinknames( cd_drives );
+ cd_drives = maplist( map drive, cd_drives,
``{
drive["udev_links"] = [ substring(drive["linkname"]:"",5) ];
return( drive );
});
- cddrives = AddAlternateLinks( cddrives );
+ cd_drives = AddAlternateLinks( cd_drives );
}
- y2milestone ("ProbeCDROMs (%1)", cddrives);
- return (size (cddrives) > 0);
+ y2milestone ("ProbeCDROMs (%1)", cd_drives);
+ return( size(cd_drives)>0 );
+ }
+
+global list<map> cddrives()
+ {
+ if( cd_drives==nil )
+ ProbeCDROMs();
+ return( cd_drives );
}
global define map GetCdromEntry( string device )
``{
map ret = $[];
y2milestone( "GetCdromEntry device %1", device );
- ret = find(map e, cddrives, ``(e["dev_orig"]:(e["dev_name"]:"") == device));
+ ret = find(map e, cd_drives, ``(e["dev_orig"]:(e["dev_name"]:"")==device));
if( ret == nil )
{
ret = $[];
@@ -339,46 +338,50 @@
* @see: FloppyDevice
*/
-global define boolean FloppyReady ()
+global define boolean FloppyReady()
``{
- if( Stage::initial () )
+ if( floppy_present==nil )
{
- y2milestone( "before .probe.floppy" );
- FloppyDrives = (list<map>) SCR::Read(.probe.floppy);
- y2milestone( "after .probe.floppy" );
-
- if( !FloppyPresent ) // only once !
- {
+ floppy_present = false;
+ floppy_drives = [];
+ if( Stage::initial() )
+ {
+ y2milestone( "before .probe.floppy" );
+ floppy_drives = (list<map>) SCR::Read(.probe.floppy);
+ y2milestone( "after .probe.floppy" );
+
// write out data for hardware status check
- foreach (map drive, FloppyDrives,
+ foreach (map drive, floppy_drives,
``{
HwStatus::Set (drive["unique_key"]:"", `yes);
});
}
+ else
+ {
+ y2milestone( "before .probe.floppy.manual" );
+ floppy_drives = (list<map>) SCR::Read(.probe.floppy.manual);
+ y2milestone( "after .probe.floppy.manual" );
+ }
+ floppy_device = floppy_drives[0,"dev_name"]:"";
+ if( (floppy_device != "") || Mode::test ())
+ {
+ floppy_present = true;
+ }
}
- else
- {
- FloppyDrives = (list<map>) SCR::Read(.probe.floppy.manual);
- }
-
- map floppy_data = FloppyDrives[0]:$[];
- FloppyDevice = floppy_data["dev_name"]:"";
- if( (FloppyDevice != "") || Mode::test ())
- {
- FloppyPresent = true;
- }
- y2milestone( "FloppyDrives %1", FloppyDrives );
- return( size(floppy_data)>0 && !haskey(floppy_data,"notready") );
+ y2milestone( "FloppyDrives %1", floppy_drives );
+ return( size(floppy_drives[0]:$[])>0 &&
+ !haskey(floppy_drives[0]:$[],"notready") );
}
// loop over floppy drives to find IDE ZIPs
// return map of $[ "device" : $[target], ...]
-define map findZIPs ()
+define map findZIPs ()
``{
- map zips = $[];
- foreach (map disk, FloppyDrives,
+ map zips = $[];
+ FloppyReady();
+ foreach (map disk, floppy_drives,
``{
if (disk["zip"]:false)
{
@@ -405,6 +408,15 @@
return zips;
}
+global define map ZipDrives()
+ {
+ if( zip_drives==nil )
+ {
+ zip_drives = findZIPs();
+ }
+ return( zip_drives );
+ }
+
/*
* Fake probing for storage devices in test or demo mode -
@@ -427,6 +439,27 @@
return target_map;
} // fakeProbe()
+global boolean FloppyPresent()
+ {
+ if( floppy_present==nil )
+ FloppyReady();
+ return( floppy_present );
+ }
+
+global string FloppyDevice()
+ {
+ if( floppy_device==nil )
+ FloppyReady();
+ return( floppy_device );
+ }
+
+global list<map> FloppyDrives()
+ {
+ if( floppy_drives==nil )
+ FloppyReady();
+ return( floppy_drives );
+ }
+
/*
* Probe for storage devices attached to storage controllers
@@ -441,6 +474,7 @@
{
return fakeProbe();
}
+ FloppyReady();
// do the probing
list<map> all_disks = (list<map>) SCR::Read(.probe.disk);
@@ -462,6 +496,7 @@
integer other_count = 0;
string fake_raid = "";
map target = $[];
+ zip_drives = $[];
foreach (map disk, filter(map e,all_disks,``(size(e["dev_name"]:"")>0)),
``{
@@ -590,7 +625,9 @@
if( (!notready||search(ddevice,"/dev/dasd")==0) && (size(target)>0) )
{
if (is_zip)
- ZipDrives[ddevice] = target;
+ {
+ zip_drives[ddevice] = target;
+ }
else
{
targets[ddevice] = target;
@@ -606,14 +643,14 @@
SCR::UnmountAgent(.disk);
- ZipDrives = (map)union (ZipDrives, findZIPs ());
+ zip_drives = (map)union( zip_drives, findZIPs() );
- foreach(string k, any e, ZipDrives,
+ foreach(string k, any e, zip_drives,
``{
- FloppyDrives = filter(map f, FloppyDrives, ``(f["dev_name"]:""!=k));
+ floppy_drives = filter(map f, floppy_drives, ``(f["dev_name"]:""!=k));
});
- y2milestone( "localProbe: FloppyDrives %1", FloppyDrives );
- y2milestone( "localProbe: ZipDrives %1", ZipDrives );
+ y2milestone( "localProbe: FloppyDrives %1", FloppyDrives() );
+ y2milestone( "localProbe: ZipDrives %1", ZipDrives() );
return targets;
}
@@ -628,16 +665,18 @@
global define map Probe(boolean force_reset)
``{
+ map target = $[];
y2milestone( "Probe force_reset:%1 disks_valid:%2", force_reset, disks_valid );
if( force_reset )
- targetMap = $[];
+ targetMapSize = 0;
- if( targetMap==$[] && disks_valid )
+ if( targetMapSize==0 && disks_valid )
{
- targetMap = localProbe();
+ target = localProbe();
+ targetMapSize = size(target);
ProbeCDROMs();
}
- return targetMap;
+ return target;
}
@@ -655,7 +694,7 @@
* Initialize
*/
-global define void FullProbe ()
+global define void FullProbe()
``{
FloppyReady(); // probe floppy
ProbeCDROMs(); // probe CDs
@@ -671,11 +710,10 @@
* Constructor
*/
-global define void StorageDevices ()
+global define void StorageDevices()
``{
- if( !Stage::initial () && !Mode::config () )
+ if( !Stage::initial() && !Mode::config() )
{
- FullProbe ();
disks_valid = true;
}
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/storage/src/modules/Storage.ycp new/yast2-storage-2.16.1/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.16.0/storage/src/modules/Storage.ycp 2007-09-25 11:40:26.000000000 +0200
+++ new/yast2-storage-2.16.1/storage/src/modules/Storage.ycp 2007-10-24 16:28:37.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 41053 2007-09-24 13:58:26Z fehr $
+ * $Id: Storage.ycp 41520 2007-10-23 10:51:49Z fehr $
*/
{
@@ -2108,7 +2108,8 @@
global define void Storage()
``{
- y2milestone( "constructor Storage()" );
+ map m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" );
+ y2milestone( "constructor Storage() time:%1", m["stdout"]:"" );
StorageMap[targets_backup_key] = $[];
StorageMap[targets_backup_l_key] = $[];
StorageMap[targets_backup_m_key] = $[];
@@ -2130,6 +2131,8 @@
Storage::SetPartProposalActive( false );
}
InstallCallbacks();
+ m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" );
+ y2milestone( "constructor Storage() end time:%1", m["stdout"]:"" );
}
@@ -4653,7 +4656,7 @@
map m = $[];
integer num = 0;
- foreach( string tdevice, any tdata, StorageDevices::ZipDrives,
+ foreach( string tdevice, any tdata, StorageDevices::ZipDrives(),
``{
m = FileSystems::GetFstabDefaultMap( "zip" );
string zfile = "/zip";
@@ -4665,7 +4668,7 @@
num = num+1;
});
num = 0;
- foreach( map drive, StorageDevices::FloppyDrives,
+ foreach( map drive, StorageDevices::FloppyDrives(),
``{
m = FileSystems::GetFstabDefaultMap( "floppy" );
string fdname = "/floppy";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.16.0/VERSION new/yast2-storage-2.16.1/VERSION
--- old/yast2-storage-2.16.0/VERSION 2007-09-26 17:34:38.000000000 +0200
+++ new/yast2-storage-2.16.1/VERSION 2007-10-23 12:52:52.000000000 +0200
@@ -1 +1 @@
-2.16.0
+2.16.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org