Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2012-05-26 13:04:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage", Maintainer is "ASchnell@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2012-05-22 10:23:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2012-05-26 13:05:03.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 23 15:15:42 CEST 2012 - fehr@suse.de
+
+- 2.22.3
+- remove mount points for windows from fstab (bnc#763630)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.22.2.tar.bz2
New:
----
yast2-storage-2.22.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.BDISgE/_old 2012-05-26 13:05:05.000000000 +0200
+++ /var/tmp/diff_new_pack.BDISgE/_new 2012-05-26 13:05:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 2.22.2
+Version: 2.22.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-storage-2.22.2.tar.bz2 -> yast2-storage-2.22.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/Makefile.am.common new/yast2-storage-2.22.3/Makefile.am.common
--- old/yast2-storage-2.22.2/Makefile.am.common 2012-05-21 14:15:40.000000000 +0200
+++ new/yast2-storage-2.22.3/Makefile.am.common 2012-05-24 17:14:23.000000000 +0200
@@ -30,7 +30,7 @@
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/VERSION new/yast2-storage-2.22.3/VERSION
--- old/yast2-storage-2.22.2/VERSION 2012-05-21 14:21:02.000000000 +0200
+++ new/yast2-storage-2.22.3/VERSION 2012-05-24 17:14:13.000000000 +0200
@@ -1 +1 @@
-2.22.2
+2.22.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/configure new/yast2-storage-2.22.3/configure
--- old/yast2-storage-2.22.2/configure 2012-05-21 14:15:53.000000000 +0200
+++ new/yast2-storage-2.22.3/configure 2012-05-24 17:14:37.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-storage 2.22.1.
+# Generated by GNU Autoconf 2.68 for yast2-storage 2.22.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -709,8 +709,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.22.1'
-PACKAGE_STRING='yast2-storage 2.22.1'
+PACKAGE_VERSION='2.22.3'
+PACKAGE_STRING='yast2-storage 2.22.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1495,7 +1495,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.22.1 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.22.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1566,7 +1566,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.22.1:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.22.3:";;
esac
cat <<\_ACEOF
@@ -1680,7 +1680,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.22.1
+yast2-storage configure 2.22.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2133,7 +2133,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.22.1, which was
+It was created by yast2-storage $as_me 2.22.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3063,7 +3063,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.22.1'
+ VERSION='2.22.3'
cat >>confdefs.h <<_ACEOF
@@ -3185,7 +3185,7 @@
-VERSION="2.22.1"
+VERSION="2.22.3"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -16097,7 +16097,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.22.1, which was
+This file was extended by yast2-storage $as_me 2.22.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16163,7 +16163,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-storage config.status 2.22.1
+yast2-storage config.status 2.22.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/configure.in new/yast2-storage-2.22.3/configure.in
--- old/yast2-storage-2.22.2/configure.in 2012-05-21 14:15:40.000000000 +0200
+++ new/yast2-storage-2.22.3/configure.in 2012-05-24 17:14:23.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-storage
dnl
-dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.22.1, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.22.3, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.22.1"
+VERSION="2.22.3"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/data/Makefile.in new/yast2-storage-2.22.3/data/Makefile.in
--- old/yast2-storage-2.22.2/data/Makefile.in 2012-05-21 14:15:56.000000000 +0200
+++ new/yast2-storage-2.22.3/data/Makefile.in 2012-05-24 17:14:40.000000000 +0200
@@ -516,7 +516,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/storage/src/Makefile.in new/yast2-storage-2.22.3/storage/src/Makefile.in
--- old/yast2-storage-2.22.2/storage/src/Makefile.in 2012-05-21 14:15:57.000000000 +0200
+++ new/yast2-storage-2.22.3/storage/src/Makefile.in 2012-05-24 17:14:41.000000000 +0200
@@ -732,7 +732,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/storage/src/modules/Makefile.in new/yast2-storage-2.22.3/storage/src/modules/Makefile.in
--- old/yast2-storage-2.22.2/storage/src/modules/Makefile.in 2012-05-21 14:15:57.000000000 +0200
+++ new/yast2-storage-2.22.3/storage/src/modules/Makefile.in 2012-05-24 17:14:41.000000000 +0200
@@ -538,7 +538,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/storage/src/modules/Storage.ycp new/yast2-storage-2.22.3/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.22.2/storage/src/modules/Storage.ycp 2012-05-21 14:14:10.000000000 +0200
+++ new/yast2-storage-2.22.3/storage/src/modules/Storage.ycp 2012-05-23 14:12:56.000000000 +0200
@@ -3466,23 +3466,26 @@
global void AddMountPointsForWin( map targets )
{
- y2milestone( "AddMountPointsForWin called" );
- integer foreign_nr = 0;
+ if( false ) // no mount points for windows any more bnc#763630
+ {
+ y2milestone( "AddMountPointsForWin called" );
+ integer foreign_nr = 0;
- foreach(string disk, map data, targets,
- ``{
- if( !data["hotpluggable"]:false &&
- data["used_by_type"]:`UB_NONE == `UB_NONE )
- AddMountPointsForWinParts( data["partitions"]:[], true,
- data["max_primary"]:4, foreign_nr );
- });
- foreach(string disk, map data, targets,
- ``{
- if( !data["hotpluggable"]:false &&
- data["used_by_type"]:`UB_NONE == `UB_NONE )
- AddMountPointsForWinParts( data["partitions"]:[], false,
- data["max_primary"]:4, foreign_nr );
- });
+ foreach(string disk, map data, targets,
+ ``{
+ if( !data["hotpluggable"]:false &&
+ data["used_by_type"]:`UB_NONE == `UB_NONE )
+ AddMountPointsForWinParts( data["partitions"]:[], true,
+ data["max_primary"]:4, foreign_nr );
+ });
+ foreach(string disk, map data, targets,
+ ``{
+ if( !data["hotpluggable"]:false &&
+ data["used_by_type"]:`UB_NONE == `UB_NONE )
+ AddMountPointsForWinParts( data["partitions"]:[], false,
+ data["max_primary"]:4, foreign_nr );
+ });
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/storage/src/modules/StorageUpdate.ycp new/yast2-storage-2.22.3/storage/src/modules/StorageUpdate.ycp
--- old/yast2-storage-2.22.2/storage/src/modules/StorageUpdate.ycp 2012-05-21 14:14:10.000000000 +0200
+++ new/yast2-storage-2.22.3/storage/src/modules/StorageUpdate.ycp 2012-05-23 18:07:29.000000000 +0200
@@ -360,6 +360,32 @@
}
}
+void UpdateFstabWindowsMounts()
+ {
+ y2milestone( "UpdateFstabWindowsMounts called" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ list<integer> rem_lines = [];
+ integer line = 0;
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ if( (search( l["fields",1]:"", "/windows/" )==0 && size(l["fields",1]:"")==10) ||
+ (search( l["fields",1]:"", "/dos/" )==0 && size(l["fields",1]:"")==6))
+ {
+ rem_lines = add( rem_lines, line );
+ }
+ line = line+1;
+ }
+ if( size(rem_lines)>0 )
+ {
+ rem_lines = sort(rem_lines);
+ y2milestone( "UpdateFstabWindowsMounts %1", rem_lines );
+ AsciiFile::RemoveLines( fstab, rem_lines );
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+ }
+
/**
* Updates fstab on disk
*
@@ -466,6 +492,10 @@
}
if( oldv["major"]:0<11 || (oldv["major"]:0==11 && oldv["minor"]:0<=2))
UpdateFstabCryptNofail();
+ /*
+ if( oldv["major"]:0<=11 || (oldv["major"]:0==12 && oldv["minor"]:0<=1))
+ UpdateFstabWindowsMounts();
+ */
// set flag -> it indicates that Update was already called
called_update = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/storage/src/proposal/Makefile.in new/yast2-storage-2.22.3/storage/src/proposal/Makefile.in
--- old/yast2-storage-2.22.2/storage/src/proposal/Makefile.in 2012-05-21 14:15:57.000000000 +0200
+++ new/yast2-storage-2.22.3/storage/src/proposal/Makefile.in 2012-05-24 17:14:41.000000000 +0200
@@ -516,7 +516,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.22.2/storage/src/testsuite/tests/windows1.out new/yast2-storage-2.22.3/storage/src/testsuite/tests/windows1.out
--- old/yast2-storage-2.22.2/storage/src/testsuite/tests/windows1.out 2012-05-21 14:14:10.000000000 +0200
+++ new/yast2-storage-2.22.3/storage/src/testsuite/tests/windows1.out 2012-05-24 17:23:07.000000000 +0200
@@ -3,4 +3,3 @@
Dump Create swap volume /dev/sda5 (517.72 MB)
Dump Create root volume /dev/sda6 (15.01 GB) with ext4
Dump Create volume /dev/sda7 (19.01 GB) for /home with ext4
-Dump Set mount point of /dev/sda1 to /windows/C
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org