pool/cifs-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 245192 from network:samba:STABLE

Browse Source 
Remove cifstab file; obsoleted by the more generic cifs credentials feature.

OBS-URL: https://build.opensuse.org/request/show/245192
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=40
This commit is contained in:
Stephan Kulow 2014-08-27 05:45:43 +00:00 committed by Git OBS Bridge
commit 19c7a77738
3 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cifs-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 19 15:24:31 UTC 2014 - lmuelle@suse.com
- Remove cifstab file; obsoleted by the more generic cifs credentials feature.
-------------------------------------------------------------------
Mon Jul 28 11:27:12 UTC 2014 - lmuelle@suse.com

22
cifs-utils.spec
View File

@ -34,7 +34,6 @@ Source6: ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_
Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh
Source4: cifstab
%if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd
%else
@ -149,7 +148,6 @@ mkdir -p \
${RPM_BUILD_ROOT}/%{_sbindir} \
${RPM_BUILD_ROOT}/%{_rundir}
install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs
install -m 0600 -p ${RPM_SOURCE_DIR}/cifstab ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba/cifstab
ln -s %{_sysconfdir}/init.d/${cifs_init_script} ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs
touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
${RPM_BUILD_ROOT}%{_rundir}/cifs
@ -159,26 +157,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
%fdupes ${RPM_BUILD_ROOT}
%endif
%pre
# non SUSE + post-12.2, update, no cifstab, but smbfstab
if [ ! 0%{?suse_version} -lt 1221 -a \
${1:-0} -gt 1 -a \
! -e /etc/samba/cifstab -a \
-f /etc/samba/smbfstab ]; then
cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move
chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || :
fi
%post
if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
test -f /etc/samba/cifstab && \
mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew
mv /var/adm/backup/etc_samba_smbfstab-move /etc/samba/cifstab
if [ -f /var/adm/backup/etc_samba_smbfs-enabled ]; then
chkconfig -a cifs >/dev/null
rm /var/adm/backup/etc_samba_smbfs-enabled
fi
fi
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
exit 0
@ -222,7 +201,6 @@ exit 0
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
%attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/samba/cifstab
%{_sbindir}/rccifs
%dir %{_sysconfdir}/samba
%ghost %{_rundir}/cifs

10
cifstab
View File

@ -1,10 +0,0 @@
# This file allows you to mount SMB/ CIFS shares during system boot while
# hiding passwords to other people than root. Use /etc/fstab for public
# available services. You have to specify at least a service name and a mount
# point. Current default vfstype is cifs.
#
# The options are explained in the manual page of mount.cifs.
#
# service moint-point vfstype options
;//fjall/test /data/test cifs username=tridge,password=foobar