[Buildroot] [git commit] openvpn: fix init script name

[Buildroot] [git commit] openvpn: fix init script name

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=41fb3df4bd370b869fea3d0b38d01f596f86f721
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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>
---
 package/openvpn/{openvpn.init => S60openvpn} |    0
 package/openvpn/openvpn.mk                   |    8 +++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/openvpn/openvpn.init b/package/openvpn/S60openvpn
similarity index 100%
rename from package/openvpn/openvpn.init
rename to 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))

[Buildroot] [git commit] openvpn: fix init script name

[Steve Calfee]

On Tue, Jan 15, 2013 at 12:34 PM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
> commit: http://git.buildroot.net/buildroot/commit/?id=41fb3df4bd370b869fea3d0b38d01f596f86f721
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Our default (busybox) rc.S implementation requires init scripts to be
> named S??*, so rename the openvpn one to S60openvpn (E.G. after network).
>

What you are proposing would work, but we already have S60nfs in
init.d. why not call your new start script S61? No big deal o does
come after n, just asking.

Regards, Steve

[Buildroot] [git commit] openvpn: fix init script name

[Peter Korsgaard]

>>>>> "Steve" == Steve Calfee <stevecalfee@gmail.com> writes:

 Steve> On Tue, Jan 15, 2013 at 12:34 PM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
 >> commit: http://git.buildroot.net/buildroot/commit/?id=41fb3df4bd370b869fea3d0b38d01f596f86f721
 >> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
 >> 
 >> Our default (busybox) rc.S implementation requires init scripts to be
 >> named S??*, so rename the openvpn one to S60openvpn (E.G. after network).
 >> 

 Steve> What you are proposing would work, but we already have S60nfs in
 Steve> init.d. why not call your new start script S61? No big deal o does
 Steve> come after n, just asking.

I must say I didn't give the exact number much though. The numbers don't
have to be unique, and there's no dependencies between nfs and openvpn
(unless people want to run nfs over vpn, then the order should be
swapped).

You could argue that we should make the order somewhere between 45
(networkmanager/connman) and 50 (network servers) so you could make the
network servers listen on the vpn interface.

Comments anybody?

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit] openvpn: fix init script name

[Arnout Vandecappelle]

On 16/01/13 09:01, Peter Korsgaard wrote:
> You could argue that we should make the order somewhere between 45
> (networkmanager/connman) and 50 (network servers) so you could make the
> network servers listen on the vpn interface.

  It sounds logical that VPN is started before the network servers.

  OTOH most servers listen on all interfaces anyway so it shouldn't make 
a difference.

  And anyway, the openvpn --daemon will exit immediately, long before the 
new tun/tap interface actually appears. So it makes no sense to consider 
anything to depend on openvpn.

  On Debian, openvpn depends on network, nfs-client and syslog, and is 
started before X. Cups and samba are started after openvpn, but ftpd, 
apache and exim4 are started before.

  Bottom line: keep it as it is, since it doesn't make a big difference.

  Regards,
  Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F