diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2005-08-03 14:20:49 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2005-08-03 14:20:49 +0000 |
commit | ea9e2b4046a212920d8abd31bc853d3571b53288 (patch) | |
tree | c13def93613d4ca546060113a32dc891047f000d /net-fs | |
parent | Version bump (diff) | |
download | gentoo-2-ea9e2b4046a212920d8abd31bc853d3571b53288.tar.gz gentoo-2-ea9e2b4046a212920d8abd31bc853d3571b53288.tar.bz2 gentoo-2-ea9e2b4046a212920d8abd31bc853d3571b53288.zip |
only install smb.conf (blank) if none is currently present in the live filesystem
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/samba/ChangeLog | 6 | ||||
-rw-r--r-- | net-fs/samba/samba-3.0.14a-r2.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index d6af5da5c2cf..cd59a5b55849 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/samba # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.187 2005/08/03 13:30:42 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.188 2005/08/03 14:20:49 seemant Exp $ + + 03 Aug 2005; Seemant Kulleen <seemant@gentoo.org> samba-3.0.14a-r2.ebuild: + only install smb.conf (blank) if none is currently present in the live + filesystem 03 Aug 2005; Seemant Kulleen <seemant@gentoo.org> samba-3.0.14a-r2.ebuild: do not install a blank smb.conf. Fixes bug #70686 diff --git a/net-fs/samba/samba-3.0.14a-r2.ebuild b/net-fs/samba/samba-3.0.14a-r2.ebuild index a7368ad791da..7ee61f46733d 100644 --- a/net-fs/samba/samba-3.0.14a-r2.ebuild +++ b/net-fs/samba/samba-3.0.14a-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.8 2005/08/03 14:02:15 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.9 2005/08/03 14:20:49 seemant Exp $ inherit eutils versionator @@ -264,7 +264,7 @@ pkg_preinst() { fi if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then - cp "${ROOT}/etc/samba/smb.conf.example" "${ROOT}/etc/samba/smb.conf" + touch ${IMAGE}/etc/samba/smb.conf fi } |