commit 1f12d757fc722e3111616dc4d6d1449cebcf971a parent ce1438f8952579d740e12a23b8eddbc5e5f5a367 Author: Jan Pobříslo <ccx@te2000.cz> Date: Tue, 19 Oct 2021 23:27:30 +0000 move where /dev/snd is bind-mounted Diffstat:
| M | zsh-functions/confz_containers_init | | | 12 | ++++++++++++ |
| M | zsh-functions/confz_site_containers_init | | | 2 | +- |
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init @@ -32,6 +32,7 @@ confz_container_service_check() { defvar down true defvar control_user root defvar control_group root + defvar fstab_post '' require fs_d flags=p filename=$vars[svc_dir] require fs_m filename=$vars[svc_dir] mode=755 @@ -53,6 +54,17 @@ confz_container_service_check() { require fs_contentnl filename=$vars[svc_dir]/data/fstab \ content=$vars[fstab] require fs_m filename=$vars[svc_dir]/data/fstab mode=644 + + require fs_d filename=$vars[svc_dir]/env + if [[ -n $vars[fstab_post] ]]; then + require fs_contentnl filename=$vars[svc_dir]/env/NS_FSTAB \ + content=data/fstab_post + require fs_contentnl filename=$vars[svc_dir]/data/fstab_post \ + content=$vars[fstab_post] + else + require fs_r filename=$vars[svc_dir]/env/NS_FSTAB + require fs_r filename=$vars[svc_dir]/data/fstab_post + fi require fs_l filename=$vars[svc_dir]/run \ destination=$vars[run_link] diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init @@ -20,7 +20,7 @@ confz_site_containers_user_check() { bindroot=$vars[containers_dir]/user/$vars[user]/alpine-jack/root require container_service_generic \ image_name=alpine-jack \ - fstab_extra=/dev/snd$'\t'$bindroot/dev/snd$'\t'$bind \ + fstab_post=/dev/snd$'\t'$bindroot/dev/snd$'\t'$bind \ :containers_dir :svscan_dir :user # bind-mounts for alpine-dev