Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2013-06-13 22:58:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes
2013-06-05 13:26:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2013-06-13 22:58:15.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 10 12:22:26 CEST 2013 - f...@suse.de
+
+- version 2.24.2
+- do not add "/proc", "/sys", ... to fstab any more and remove
+ these fstab entries during update, they are handled by systemd
+ (bnc#823903)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.24.1.tar.bz2
New:
----
yast2-storage-2.24.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.vqfEho/_old 2013-06-13 22:58:17.000000000 +0200
+++ /var/tmp/diff_new_pack.vqfEho/_new 2013-06-13 22:58:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 2.24.1
+Version: 2.24.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-storage-2.24.1.tar.bz2 -> yast2-storage-2.24.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.24.1/VERSION
new/yast2-storage-2.24.2/VERSION
--- old/yast2-storage-2.24.1/VERSION 2013-04-16 18:16:37.000000000 +0200
+++ new/yast2-storage-2.24.2/VERSION 2013-06-10 14:25:57.000000000 +0200
@@ -1 +1 @@
-2.24.1
+2.24.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.24.1/configure
new/yast2-storage-2.24.2/configure
--- old/yast2-storage-2.24.1/configure 2013-05-28 14:23:49.000000000 +0200
+++ new/yast2-storage-2.24.2/configure 2013-06-10 14:26:14.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-storage 2.24.1.
+# Generated by GNU Autoconf 2.69 for yast2-storage 2.24.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.24.1'
-PACKAGE_STRING='yast2-storage 2.24.1'
+PACKAGE_VERSION='2.24.2'
+PACKAGE_STRING='yast2-storage 2.24.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1380,7 +1380,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.24.1 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.24.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1451,7 +1451,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.24.1:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.24.2:";;
esac
cat <<\_ACEOF
@@ -1569,7 +1569,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.24.1
+yast2-storage configure 2.24.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2022,7 +2022,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.24.1, which was
+It was created by yast2-storage $as_me 2.24.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2961,7 +2961,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.24.1'
+ VERSION='2.24.2'
cat >>confdefs.h <<_ACEOF
@@ -3084,7 +3084,7 @@
-VERSION="2.24.1"
+VERSION="2.24.2"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschn...@suse.de>"
@@ -16825,7 +16825,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.24.1, which was
+This file was extended by yast2-storage $as_me 2.24.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16891,7 +16891,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.24.1
+yast2-storage config.status 2.24.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.24.1/configure.in
new/yast2-storage-2.24.2/configure.in
--- old/yast2-storage-2.24.1/configure.in 2013-05-28 14:23:36.000000000
+0200
+++ new/yast2-storage-2.24.2/configure.in 2013-06-10 14:26:04.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.24.1, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.24.2, 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.24.1"
+VERSION="2.24.2"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschn...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.24.1/storage/src/modules/Storage.ycp
new/yast2-storage-2.24.2/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.24.1/storage/src/modules/Storage.ycp 2013-04-17
17:01:36.000000000 +0200
+++ new/yast2-storage-2.24.2/storage/src/modules/Storage.ycp 2013-06-10
14:25:57.000000000 +0200
@@ -5492,13 +5492,6 @@
global define void WriteFstab()
``{
y2milestone( "WriteFstab called" );
- Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "proc" ) );
- Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "sys" ) );
- Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "debug" ) );
- if( Hotplug::haveUSB )
- Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "usb" ) );
- Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "pts" ) );
-
HandleModulesOnBoot( GetTargetMap() );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-2.24.1/storage/src/modules/StorageUpdate.ycp
new/yast2-storage-2.24.2/storage/src/modules/StorageUpdate.ycp
--- old/yast2-storage-2.24.1/storage/src/modules/StorageUpdate.ycp
2013-01-22 12:12:36.000000000 +0100
+++ new/yast2-storage-2.24.2/storage/src/modules/StorageUpdate.ycp
2013-06-10 14:25:57.000000000 +0200
@@ -386,6 +386,33 @@
}
}
+void UpdateFstabRemoveSystemdMps()
+ {
+ y2milestone( "UpdateFstabRemoveSystemdMps called" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ list<integer> rem_lines = [];
+ list<string> rem_dirs = [ "/proc", "/sys", "/sys/kernel/debug", "/dev/pts",
+ "/proc/bus/usb" ];
+ integer line = 0;
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ if( contains( rem_dirs, l["fields",1]:"" ))
+ {
+ rem_lines = add( rem_lines, line );
+ }
+ line = line+1;
+ }
+ if( size(rem_lines)>0 )
+ {
+ rem_lines = sort(rem_lines);
+ y2milestone( "UpdateFstabRemoveSystemdMps %1", rem_lines );
+ AsciiFile::RemoveLines( fstab, rem_lines );
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+ }
+
/**
* Updates fstab on disk
*
@@ -496,6 +523,8 @@
if( oldv["major"]:0<=11 || (oldv["major"]:0==12 &&
oldv["minor"]:0<=1))
UpdateFstabWindowsMounts();
*/
+ if( oldv["major"]:0<13 )
+ UpdateFstabRemoveSystemdMps();
// set flag -> it indicates that Update was already called
called_update = true;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
