Re-adding wifi config to match old droid-hal

This commit is contained in:
Adam Boardman 2021-01-01 22:06:56 +00:00
parent 848f32ad27
commit 424b08f954
4 changed files with 26 additions and 43 deletions

View file

@ -0,0 +1,13 @@
[Unit]
Description=Enable wlan module
Conflicts=shutdown.target actdead.target
After=lxc-android.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/droid/enable-wifi.sh
ExecStop=/usr/bin/droid/disable-wifi.sh
[Install]
WantedBy=multi-user.target

4
usr/bin/droid/disable-wifi.sh Executable file
View file

@ -0,0 +1,4 @@
#!/bin/bash
if [ -e "/dev/wmtWifi" ]; then
echo 0 > /dev/wmtWifi
fi

9
usr/bin/droid/enable-wifi.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/bash
while [ ! -e "/dev/wmtWifi" ]; do
sleep 1
done
sleep 3
echo 1 > /dev/wmtWifi

View file

@ -1,5 +1,4 @@
#lxc.net.0.type = none
lxc.net.0.type = empty
lxc.rootfs.path = dir:/var/lib/lxc/android/rootfs
@ -16,9 +15,6 @@ lxc.cap.drop = mac_admin mac_override sys_time sys_module sys_rawio
# Blacklist some syscalls which are not safe in privileged containers
lxc.seccomp.profile = /usr/share/lxc/config/common.seccomp
# Appears to be removed in latest lxc versions
#lxc.pivotdir = lxc_putold
lxc.hook.pre-start = /var/lib/lxc/android/pre-start.sh
#this might not be needed?
@ -27,45 +23,6 @@ lxc.hook.pre-start = /var/lib/lxc/android/pre-start.sh
lxc.apparmor.profile = unconfined
lxc.autodev = 0
# CGroup whitelist
lxc.cgroup.devices.deny = a
## Allow any mknod (but not reading/writing the node)
lxc.cgroup.devices.allow = c *:* m
lxc.cgroup.devices.allow = b *:* m
## Allow specific devices
### /dev/null
lxc.cgroup.devices.allow = c 1:3 rwm
### /dev/zero
lxc.cgroup.devices.allow = c 1:5 rwm
### /dev/full
lxc.cgroup.devices.allow = c 1:7 rwm
### /dev/tty
lxc.cgroup.devices.allow = c 5:0 rwm
### /dev/console
lxc.cgroup.devices.allow = c 5:1 rwm
### /dev/ptmx
lxc.cgroup.devices.allow = c 5:2 rwm
### /dev/random
lxc.cgroup.devices.allow = c 1:8 rwm
### /dev/urandom
lxc.cgroup.devices.allow = c 1:9 rwm
### /dev/pts/*
lxc.cgroup.devices.allow = c 136:* rwm
### fuse
lxc.cgroup.devices.allow = c 10:229 rwm
# Extra cgroup device access
## rtc
lxc.cgroup.devices.allow = c 254:0 rm
## tun
lxc.cgroup.devices.allow = c 10:200 rwm
## hpet
lxc.cgroup.devices.allow = c 10:228 rwm
## kvm
lxc.cgroup.devices.allow = c 10:232 rwm
## To use loop devices, copy the following line to the container's
## configuration file (uncommented).
#lxc.cgroup.devices.allow = b 7:* rwm
lxc.hook.mount = /usr/share/lxcfs/lxc.mount.hook
lxc.hook.post-stop = /usr/share/lxcfs/lxc.reboot.hook