Accepting request 258713 from network:samba:STABLE

- Remove dependency on gpg-offline as signature checking is implemented in the
  source validator.

- Add README.cifstab.migration to document the cifstab removal.

OBS-URL: https://build.opensuse.org/request/show/258713
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2014-11-05 15:26:31 +00:00 committed by Git OBS Bridge
commit d09ae76330
4 changed files with 38 additions and 5 deletions

22
README.cifstab.migration Normal file
View File

@ -0,0 +1,22 @@
openSUSE pre-13.2 and SUSE Linux Enterprise pre-12 cifstab migration
====================================================================
The /etc/samba/cifstab approach to handle mounting of cifs shares at systems
startup has been discontinued and obsoleted by the generic /etc/fstab one.
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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 28 19:04:30 UTC 2014 - lmuelle@suse.com
- Remove dependency on gpg-offline as signature checking is implemented in the
source validator.
-------------------------------------------------------------------
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

View File

@ -25,7 +25,9 @@ Group: System/Filesystems
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
# ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc
Source6: cifs-utils.keyring
Source100: README.cifstab.migration
%if "%{_vendor}" == "suse"
%define NET_CFGDIR network
%else
@ -74,9 +76,6 @@ BuildRequires: pkg-config
BuildRequires: pkgconfig
%endif
Requires: keyutils
%if 0%{?suse_version} > 1220
BuildRequires: gpg-offline
%endif
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
@ -111,8 +110,8 @@ for each user from somewhere. The pam_cifscreds module can be used to
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 +183,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)