jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-27 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor bugfix

Browse Source
This commit is contained in:
pvizeli 2017-03-22 11:08:42 +01:00
parent 6e711e07a9
commit cefba97714
7 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-hassio/classes/resin-connectable-service.bbclass Normal file
View File

@ -0,0 +1,16 @@
# resin-connectable-service bbclass
#
# Author: Andrei Gherzan <andrei@resin.io>
python __anonymous() {
# Enable/disable systemd services listed in RESIN_CONNECTABLE_SERVICES based on
# RESIN_CONNECTABLE_ENABLE_SERVICES
pn = d.getVar('PN', True)
services = d.getVar('RESIN_CONNECTABLE_SERVICES', True).split()
if pn in services:
d.setVar('SYSTEMD_AUTO_ENABLE', 'enable')
}
systemd_populate_packages[vardeps] += "RESIN_CONNECTABLE_ENABLE_SERVICES"

1
meta-hassio/conf/distro/hassio.conf
View File

@ -3,3 +3,4 @@ require conf/distro/include/resin-os.inc
PREFERRED_PROVIDER_docker-disk = "docker-resin-supervisor-disk" PREFERRED_PROVIDER_docker-disk = "docker-resin-supervisor-disk"
RESIN_CONNECTABLE_SERVICES_remove = "openvpn" RESIN_CONNECTABLE_SERVICES_remove = "openvpn"
DISTRO_FEATURES_remove = "development-image"

1
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/update-resin-supervisor
View File

@ -51,6 +51,7 @@ done
# Don't souce before parsing args - resin-vars parses args too # Don't souce before parsing args - resin-vars parses args too
source /usr/sbin/resin-vars source /usr/sbin/resin-vars
source /etc/resin-supervisor/supervisor.conf
# A temporary file used until next reboot # A temporary file used until next reboot
UPDATECONF=/tmp/update-supervisor.conf UPDATECONF=/tmp/update-supervisor.conf

3
meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
View File

@ -16,9 +16,6 @@ FILES_${PN} += " \
do_install_append() { do_install_append() {
mkdir -p ${D}/home/root/.ssh mkdir -p ${D}/home/root/.ssh
install -d ${D}${sysconfdir}/default
sed -i '/DROPBEAR_EXTRA_ARGS="-g"/d' ${D}/etc/default/dropbear
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/sync-authorized-keys.sh ${D}${bindir} install -m 0755 ${WORKDIR}/sync-authorized-keys.sh ${D}${bindir}

3
meta-hassio/recipes-core/packagegroups/packagegroup-resin.bbappend Normal file
View File

@ -0,0 +1,3 @@
RDEPENDS_${PN}.remove = "resin-connectable"
RDEPENDS_${PN}.remove = "resin-provisioner"

6
meta-hassio/recipes-support/resin-vars/resin-vars/resin-vars
View File

@ -42,12 +42,6 @@ if [ -z "$CONFIG_PATH" ]; then
CONFIG_PATH=$BOOT_MOUNTPOINT/config.json CONFIG_PATH=$BOOT_MOUNTPOINT/config.json
fi fi
# Resin supervisor variables
source /etc/resin-supervisor/supervisor.conf
# ResinOS variables
source /etc/hassio.conf
# If config.json provides redefinitions for our vars let us rewrite their # If config.json provides redefinitions for our vars let us rewrite their
# runtime value # runtime value
if [ -f $CONFIG_PATH ] if [ -f $CONFIG_PATH ]

2
meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
View File

@ -13,6 +13,8 @@ source /etc/profile
# load config # load config
source /usr/sbin/resin-vars source /usr/sbin/resin-vars
source /etc/resin-supervisor/supervisor.conf
source /etc/hassio.conf
# Help function # Help function
function help { function help {