brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Improvements to appimg container launching

Browse Source
This commit is contained in:
Bruce Leidl 2018-02-16 18:20:05 -05:00
parent a2b59334d5
commit 6151468d69
6 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-citadel-distro/recipes-core/primary-user-appimg/files/primary-user-appimg.path Normal file
View File

@ -0,0 +1,5 @@
[Unit]
Description=Wait for creation of /run/user/1000/pulse/native
[Path]
PathExists=/run/user/1000/pulse/native

3
meta-citadel-distro/recipes-core/primary-user-appimg/files/primary-user-appimg.service
View File

@ -9,6 +9,3 @@ KillMode=mixed
Type=notify Type=notify
RestartForceExitStatus=133 RestartForceExitStatus=133
SuccessExitStatus=133 SuccessExitStatus=133
[Install]
WantedBy=multi-user.target

14
meta-citadel-distro/recipes-core/primary-user-appimg/files/primary.nspawn
View File

@ -1,6 +1,20 @@
[Exec]
Boot=true Boot=true
[Files]
BindReadOnly=/usr/share/themes/Adapta BindReadOnly=/usr/share/themes/Adapta
BindReadOnly=/usr/share/themes/Adapta-Eta BindReadOnly=/usr/share/themes/Adapta-Eta
BindReadOnly=/usr/share/themes/Adapta-Nokto BindReadOnly=/usr/share/themes/Adapta-Nokto
BindReadOnly=/usr/share/themes/Adapta-Nokto-Eta BindReadOnly=/usr/share/themes/Adapta-Nokto-Eta
BindReadOnly=/usr/share/icons/Paper BindReadOnly=/usr/share/icons/Paper
Bind=/storage/user-data/primary-home:/home/user
BindReadOnly=/storage/citadel-state/resolv.conf:/etc/resolv.conf
Bind=/dev/snd
Bind=/dev/shm
Bind=/run/user/1000/pulse:/run/user/host/pulse
#Bind=/run/user/1000/wayland-0:/run/user/host/wayland-0
#Bind=/dev/kvm

10
meta-citadel-distro/recipes-core/primary-user-appimg/files/watch-run-user.path Normal file
View File

@ -0,0 +1,10 @@
[Unit]
Description=Watch Just watching Run User
After=run-user-1000.mount
Requires=run-user-1000.mount
[Path]
PathExists=/run/user/1000
[Install]
WantedBy=multi-user.target

6
meta-citadel-distro/recipes-core/primary-user-appimg/files/watch-run-user.service Normal file
View File

@ -0,0 +1,6 @@
[Unit]
Description=Watch run-user service
[Service]
Type=oneshot
ExecStart=/usr/bin/systemctl --no-block start primary-user-appimg.path

13
meta-citadel-distro/recipes-core/primary-user-appimg/primary-user-appimg.bb
View File

@ -7,16 +7,25 @@ DEPENDS = ""
inherit systemd inherit systemd
SRC_URI = "file://primary-user-appimg.service file://primary.nspawn file://run-in-image" SRC_URI = "file://primary-user-appimg.path file://primary-user-appimg.service file://primary.nspawn file://watch-run-user.path file://watch-run-user.service file://run-in-image"
S = "${WORKDIR}" S = "${WORKDIR}"
SYSTEMD_SERVICE_${PN} = "primary-user-appimg.service" SYSTEMD_SERVICE_${PN} = "watch-run-user.path"
RDEPENDS_${PN} = "bash" RDEPENDS_${PN} = "bash"
FILES_${PN} += "\
${systemd_system_unitdir}/watch-run-user.service \
${systemd_system_unitdir}/primary-user-appimg.path \
${systemd_system_unitdir}/primary-user-appimg.service \
"
do_install() { do_install() {
install -d ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/primary-user-appimg.path ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/primary-user-appimg.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/primary-user-appimg.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/watch-run-user.path ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/watch-run-user.service ${D}${systemd_system_unitdir}
install -d ${D}${sysconfdir}/systemd/nspawn install -d ${D}${sysconfdir}/systemd/nspawn
install -m 644 ${WORKDIR}/primary.nspawn ${D}${sysconfdir}/systemd/nspawn install -m 644 ${WORKDIR}/primary.nspawn ${D}${sysconfdir}/systemd/nspawn
install -d ${D}${libexecdir} install -d ${D}${libexecdir}