summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-01-15 20:30:14 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-15 20:34:14 (GMT)
commit41fb3df4bd370b869fea3d0b38d01f596f86f721 (patch)
treec33ab6fe96ec8a783e26e78a241df01ba0234fb7
parent763ad50bd72dead80d2a50c637291f06da8caaaf (diff)
downloadbuildroot-41fb3df4bd370b869fea3d0b38d01f596f86f721.tar.gz
buildroot-41fb3df4bd370b869fea3d0b38d01f596f86f721.tar.bz2
openvpn: fix init script name
Our default (busybox) rc.S implementation requires init scripts to be named S??*, so rename the openvpn one to S60openvpn (E.G. after network). At the same time remove the deprecated check-if-custom-skeleton-provided-file and just always install the init script. People can always fixup/remove it in their post-build script if needed. Also name the init script source the same as the destination file name in TARGET_DIR for consistency. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rwxr-xr-xpackage/openvpn/S60openvpn (renamed from package/openvpn/openvpn.init)0
-rw-r--r--package/openvpn/openvpn.mk8
2 files changed, 3 insertions, 5 deletions
diff --git a/package/openvpn/openvpn.init b/package/openvpn/S60openvpn
index 94bdc60..94bdc60 100755
--- a/package/openvpn/openvpn.init
+++ b/package/openvpn/S60openvpn
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 2658d76..a49daca 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -42,15 +42,13 @@ endif
define OPENVPN_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \
$(TARGET_DIR)/usr/sbin/openvpn
- if [ ! -f $(TARGET_DIR)/etc/init.d/openvpn ]; then \
- $(INSTALL) -m 755 -D package/openvpn/openvpn.init \
- $(TARGET_DIR)/etc/init.d/openvpn; \
- fi
+ $(INSTALL) -m 755 -D package/openvpn/S60openvpn \
+ $(TARGET_DIR)/etc/init.d/S60openvpn
endef
define OPENVPN_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/sbin/openvpn
- rm -f $(TARGET_DIR)/etc/init.d/openvpn
+ rm -f $(TARGET_DIR)/etc/init.d/S60openvpn
endef
$(eval $(autotools-package))