From f1efc8a32778f3defc1861ed0306b60d96c4798725afba8abfd7018055437190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 28 Oct 2014 11:13:02 +0000
Subject: [PATCH] Add README.cifstab.migration to document the cifstab removal.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=118
---
 README.cifstab.migration | 22 ++++++++++++++++++++++
 cifs-utils.changes       |  5 +++++
 cifs-utils.spec          |  3 +++
 3 files changed, 30 insertions(+)
 create mode 100644 README.cifstab.migration

diff --git a/README.cifstab.migration b/README.cifstab.migration
new file mode 100644
index 0000000..a48d0a4
--- /dev/null
+++ b/README.cifstab.migration
@@ -0,0 +1,22 @@
+openSUSE pre-13.1 and SUSE Linux Enterprise pre-12 cifstab migration
+====================================================================
+
+The /etc/samba/cifstab approach to handle mounting of cifs shares at systems
+startup got discontinued and obsoleted by the generic /etc/fstab approach.
+
+The migration process requires two steps:
+
+1. Append all your mount points from /etc/samba/cifstab.rpmsave to /etc/fstab
+
+2. Add "0 0" to the end of each new cifs mount line in /etc/fstab
+
+
+Example:
+
+An existing configuration used in /etc/samba/cifstab:
+
+//DATA01/someshare /media/DATA01/someshare cifs credentials=/etc/samba/mycredentials,uid=1000,gid=100,file_mode=0644,dir_mode=0755,domain=MYDOMAIN,rw,setuids
+
+results in the following line in /etc/fstab:
+
+//DATA01/someshare /media/DATA01/someshare cifs credentials=/etc/samba/mycredentials,uid=1000,gid=100,file_mode=0644,dir_mode=0755,domain=MYDOMAIN,rw,setuids 0 0
diff --git a/cifs-utils.changes b/cifs-utils.changes
index 2c59754..1f97765 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 28 10:47:47 UTC 2014 - lmuelle@suse.com
+
+- Add README.cifstab.migration to document the cifstab removal.
+
 -------------------------------------------------------------------
 Mon Oct 13 22:01:06 UTC 2014 - lmuelle@suse.com
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 6b29fc8..0e307ea 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -26,6 +26,7 @@ Url:            http://www.samba.org/linux-cifs/cifs-utils/
 Source:         ftp://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2
 Source5:        ftp://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2.asc
 Source6:        ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc
+Source100:      README.cifstab.migration
 %if "%{_vendor}" == "suse"
 %define  NET_CFGDIR network
 %else
@@ -113,6 +114,7 @@ provide these credentials to the kernel automatically at login.
 %prep
 %{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}}
 %setup -q
+cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"
@@ -184,6 +186,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %dir %{_sysconfdir}/samba
 %ghost %{_rundir}/cifs
 %endif
+%doc README.cifstab.migration
 
 %files devel
 %defattr(-,root,root)