From f3c39318c3e80a016f1f3881b673115bd0601897 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 28 Apr 2010 14:09:15 +0000 Subject: [PATCH 1/1] [packages] samba3: don't ship dangling symlink in package, create the link at startup instead SVN-Revision: 21234 --- net/samba3/Makefile | 5 ++--- net/samba3/files/samba.init | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 8351cc39ad..7dcaac9380 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2009 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba3 PKG_VERSION:=3.0.24 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_MD5SUM:=89273f67a6d8067cbbecefaa13747153 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/samba/old-versions/ @@ -60,7 +60,6 @@ define Package/samba3/install $(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba $(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba $(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba/ - cd $(1)/etc/samba; rm -r smb.conf; ln -s /tmp/smb.conf touch $(1)/etc/samba/smbpasswd $(INSTALL_DIR) $(1)/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd $(1)/bin/ diff --git a/net/samba3/files/samba.init b/net/samba3/files/samba.init index 5b4b8f5cec..76fcae9d96 100755 --- a/net/samba3/files/samba.init +++ b/net/samba3/files/samba.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org . /etc/functions.sh @@ -22,6 +22,7 @@ smb_header() { [ -z "$description" ] && description=openwrt cp /etc/samba/smb.conf.template /tmp/smb.conf + [ -L /etc/samba/smb.conf ] || ln -nsf /tmp/smb.conf /etc/samba/smb.conf sed -i "s/|NAME|/$name/g" /tmp/smb.conf sed -i "s/|WORKGROUP|/$workgroup/g" /tmp/smb.conf sed -i "s/|DESCRIPTION|/$description/g" /tmp/smb.conf -- 2.30.2