diff --git a/debian/control b/debian/control index dc16d6d..9ca9507 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Homepage: https://github.com/gemian/lxc-android Package: lxc-android Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, lxc +Conflicts: droid-hal-cosmopda Description: lxc configuration for starting android . This package provides the configuration for starting android in lxc diff --git a/lib/systemd/system/system.mount b/lib/systemd/system/system.mount index 87c657b..6538af9 100644 --- a/lib/systemd/system/system.mount +++ b/lib/systemd/system/system.mount @@ -6,6 +6,7 @@ Before=local-fs.target systemd-modules-load.service What=/system_root/system Where=/system Type=overlay +Options=lowerdir=/usr/lib/lxc-android/system:/system_root/system # Default is 90 which makes mount period too long in case of # errors so drop it down a notch. @@ -13,6 +14,3 @@ TimeoutSec=10 [Install] WantedBy=local-fs.target - -# From ./out/target/product/cosmopda/root/fstab.mt6771 : -# /dev/mmcblk0p33 / ext4 ro wait,verify,recoveryonly diff --git a/var/lib/lxc/android/config b/var/lib/lxc/android/config index c86c3c8..693dedb 100644 --- a/var/lib/lxc/android/config +++ b/var/lib/lxc/android/config @@ -70,12 +70,12 @@ lxc.hook.mount = /usr/share/lxcfs/lxc.mount.hook lxc.hook.post-stop = /usr/share/lxcfs/lxc.reboot.hook -#lxc.mount.entry = tmpfs dev tmpfs nosuid 0 0 -#lxc.mount.entry = /dev/__properties__ dev/__properties__ bind bind,create=dir 0 0 -#lxc.mount.entry = /dev/socket dev/socket bind bind,create=dir 0 0 -#lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 -#lxc.mount.entry = sys sys sysfs nodev,noexec,nosuid 0 0 -##lxc.mount.entry = tmp tmp tmpfs nodev,noexec,nosuid 0 0 +lxc.mount.entry = tmpfs dev tmpfs nosuid 0 0 +lxc.mount.entry = /dev/__properties__ dev/__properties__ bind bind,create=dir 0 0 +lxc.mount.entry = /dev/socket dev/socket bind bind,create=dir 0 0 +lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 +lxc.mount.entry = sys sys sysfs nodev,noexec,nosuid 0 0 +#lxc.mount.entry = tmp tmp tmpfs nodev,noexec,nosuid 0 0 #lxc.mount.entry = /android/data data bind bind 0 0 -#lxc.mount.entry = /vendor vendor bind rbind 0 0 -#lxc.mount.entry = /mnt mnt bind rbind 0 0 +lxc.mount.entry = /vendor vendor bind rbind 0 0 +lxc.mount.entry = /mnt mnt bind rbind 0 0