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

user-rootfs called appimg now, pass it on

Browse Source
This commit is contained in:
brl 2018-02-12 22:09:48 -05:00
parent 3bd3cad3c7
commit 01826e053d
7 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-citadel-distro/recipes-core/default-user-rootfs/default-user-rootfs.bb
View File

@ -1,19 +0,0 @@
DESCRIPTION = "Install systemd unit file to automatically start default-user-rootfs container"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SECTION = ""
DEPENDS = ""
inherit systemd
SRC_URI = "file://default-user-rootfs.service"
S = "${WORKDIR}"
SYSTEMD_SERVICE_${PN} = "default-user-rootfs.service"
do_install() {
install -d ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/default-user-rootfs.service ${D}${systemd_system_unitdir}
}

13
meta-citadel-distro/recipes-core/default-user-rootfs/files/default-user-rootfs.service
View File

@ -1,13 +0,0 @@
[Unit]
Description=Default User Image
ConditionPathExists=/storage/machines/default-user-rootfs
[Service]
ExecStart=/usr/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --directory=/storage/machines/default-user-rootfs
KillMode=mixed
Type=notify
RestartForceExitStatus=133
SuccessExitStatus=133
[Install]
WantedBy=multi-user.target

3
meta-citadel-distro/recipes-core/packagegroups/packagegroup-citadel-desktop.bb
View File

@ -74,5 +74,6 @@ RDEPENDS_${PN} = "\
cryptsetup \
e2fsprogs \
dosfstools \
default-user-rootfs \
btrfs-tools \
primary-user-appimg\
"

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

@ -0,0 +1,14 @@
[Unit]
Description=Default User appimg
ConditionPathExists=/storage/appimg/primary/rootfs
[Service]
ExecStart=/usr/bin/systemd-nspawn --quiet --keep-unit --machine=primary --link-journal=try-guest --directory=/storage/appimg/primary/rootfs
KillMode=mixed
Type=notify
RestartForceExitStatus=133
SuccessExitStatus=133
[Install]
WantedBy=multi-user.target

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

@ -0,0 +1,6 @@
Boot=true
BindReadOnly=/usr/share/themes/Adapta
BindReadOnly=/usr/share/themes/Adapta-Eta
BindReadOnly=/usr/share/themes/Adapta-Nokto
BindReadOnly=/usr/share/themes/Adapta-Nokto-Eta
BindReadOnly=/usr/share/icons/Paper

2
meta-citadel-distro/recipes-core/primary-user-appimg/files/run-in-image Normal file
View File

@ -0,0 +1,2 @@
#!/bin/bash
machinectl -E DESKTOP_STARTUP_ID=${DESKTOP_STARTUP_ID} shell user@primary /usr/libexec/launch $@

24
meta-citadel-distro/recipes-core/primary-user-appimg/primary-user-appimg.bb Normal file
View File

@ -0,0 +1,24 @@
DESCRIPTION = "Install systemd unit file to automatically start primary-user-appimg container"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SECTION = ""
DEPENDS = ""
inherit systemd
SRC_URI = "file://primary-user-appimg.service file://primary.nspawn file://run-in-image"
S = "${WORKDIR}"
SYSTEMD_SERVICE_${PN} = "primary-user-appimg.service"
RDEPENDS_${PN} = "bash"
do_install() {
install -d ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/primary-user-appimg.service ${D}${systemd_system_unitdir}
install -d ${D}${sysconfdir}/systemd/nspawn
install -m 644 ${WORKDIR}/primary.nspawn ${D}${sysconfdir}/systemd/nspawn
install -d ${D}${libexecdir}
install -m 755 ${WORKDIR}/run-in-image ${D}${libexecdir}
}