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

add service for lvm activation since everything for early activation in latest LVM is broken

Browse Source
This commit is contained in:
Bruce Leidl 2019-01-15 12:27:17 -05:00
parent ea8d4314e7
commit 1b0ce58f32
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
View File

@ -8,12 +8,12 @@ SRC_URI = "\
file://initrd-release \ file://initrd-release \
file://crypttab \ file://crypttab \
file://11-dm.rules \ file://11-dm.rules \
file://citadel-lvm-activate.service \
file://citadel-rootfs-mount.path \ file://citadel-rootfs-mount.path \
file://citadel-rootfs-mount.service \ file://citadel-rootfs-mount.service \
file://citadel-rootfs-setup.service \ file://citadel-rootfs-setup.service \
file://citadel-install-rootfs-mount.service \ file://citadel-install-rootfs-mount.service \
file://citadel-install-rootfs-setup.service \ file://citadel-install-rootfs-setup.service \
file://citadel-image.conf \
file://99-grsec.conf \ file://99-grsec.conf \
" "
@ -28,6 +28,7 @@ do_install() {
done done
install -d ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/citadel-lvm-activate.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/citadel-rootfs-mount.path ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/citadel-rootfs-mount.path ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/citadel-rootfs-mount.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/citadel-rootfs-mount.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/citadel-rootfs-setup.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/citadel-rootfs-setup.service ${D}${systemd_system_unitdir}

18
meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-lvm-activate.service Normal file
View File

@ -0,0 +1,18 @@
[Unit]
Description=Activate LVM volumes
DefaultDependencies=no
AssertPathExists=/etc/initrd-release
# Don't run if running from installer or in live mode
ConditionKernelCommandLine=!citadel.install
ConditionKernelCommandLine=!citadel.live
Requires=cryptsetup.target
After=cryptsetup.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/sbin/vgchange -v -aay --sysinit

2
meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.path
View File

@ -13,6 +13,8 @@ ConditionKernelCommandLine=root=/dev/mapper/rootfs
ConditionKernelCommandLine=!citadel.install ConditionKernelCommandLine=!citadel.install
ConditionKernelCommandLine=!citadel.live ConditionKernelCommandLine=!citadel.live
Requires=citadel-lvm-activate.service
[Path] [Path]
PathChanged=/dev/mapper PathChanged=/dev/mapper