Revert "sysmocom-openvpn-config: Always start but rename the config file"

This reverts commit 34d053fbe8.

It was found that this patch (from 7 years ago) breaks upgrade path and
current behavior (user manual) of the sysmocom VPN.
It is expected that the systemd service openvpn.service is disabled by
default, and that the user simply has to enable/disable it to
enable/disable the sysmocom VPN.
This affects all images deployed until today, since until recently an
old sysmocom-openvpn-config package (from around 2013) was being used
during provisioning, instead of using the one we recently made available
into the regular 201705 feeds.

Related: SYS#5734
pull/6/head
Pau Espin 11 months ago
parent 9b11700f57
commit c0ec9b62e7
  1. 15
      recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb

@ -5,21 +5,12 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://sysmocom-vpn.conf"
PR = "r5"
PR = "r6"
CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf.off"
CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf"
PACKAGE_ARCH = "all"
do_install() {
install -d ${D}${sysconfdir}/openvpn
install -m 0644 ${WORKDIR}/sysmocom-vpn.conf ${D}${sysconfdir}/openvpn/sysmocom-vpn.conf.off
}
# Always enable the OpenVPN service. This assumes that
# this package will never be inside the nornal sysmocom
# feed.
FILES_${PN} += "${systemd_unitdir}"
do_install_append() {
install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
ln -sf ../openvpn.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
install -m 0644 ${WORKDIR}/sysmocom-vpn.conf ${D}${sysconfdir}/openvpn
}

Loading…
Cancel
Save