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

updated with new citadel-tool command names

Browse Source
This commit is contained in:
Bruce Leidl 2019-04-02 15:49:53 -04:00
parent f9308dd6ee
commit 3421901536
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,6 @@ SRC_URI = "\
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://99-grsec.conf \ file://99-grsec.conf \
" "
@ -33,7 +32,6 @@ do_install() {
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}
install -m 644 ${WORKDIR}/citadel-install-rootfs-mount.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/citadel-install-rootfs-mount.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/citadel-install-rootfs-setup.service ${D}${systemd_system_unitdir}
install -d ${D}${systemd_system_unitdir}/sysinit.target.wants install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
ln -s ../citadel-rootfs-mount.path ${D}${systemd_system_unitdir}/sysinit.target.wants/citadel-rootfs-mount.path ln -s ../citadel-rootfs-mount.path ${D}${systemd_system_unitdir}/sysinit.target.wants/citadel-rootfs-mount.path

3
meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
View File

@ -22,5 +22,4 @@ Before=citadel-rootfs-setup.service
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=-/usr/bin/plymouth message --text="Copying files from boot disk and decompressing rootfs image" ExecStartPre=-/usr/bin/plymouth message --text="Copying files from boot disk and decompressing rootfs image"
ExecStart=/usr/libexec/citadel-install copy-artifacts ExecStart=/usr/libexec/citadel-boot rootfs
ExecStart=/usr/libexec/citadel-mount rootfs

2
meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service
View File

@ -15,5 +15,5 @@ ConditionKernelCommandLine=|citadel.live
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=-/usr/bin/plymouth message --text="Setting up filesystem in RAM for live boot" ExecStartPre=-/usr/bin/plymouth message --text="Setting up filesystem in RAM for live boot"
ExecStart=/usr/libexec/citadel-install live-setup ExecStart=/usr/libexec/citadel-boot setup
ExecStartPost=-/usr/bin/plymouth message --text="Starting desktop" ExecStartPost=-/usr/bin/plymouth message --text="Starting desktop"

4
meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.service
View File

@ -13,6 +13,7 @@ ConditionPathExists=/dev/mapper/citadel-storage
# Pull in the unit that mounts 'extra' and 'kernel' images # Pull in the unit that mounts 'extra' and 'kernel' images
# #
Wants=citadel-rootfs-setup.service Wants=citadel-rootfs-setup.service
Before=citadel-rootfs-setup.service
# #
# citadel-mount needs to run in pax soft mode # citadel-mount needs to run in pax soft mode
@ -21,6 +22,7 @@ Requires=systemd-sysctl.service
After=systemd-sysctl.service After=systemd-sysctl.service
[Service] [Service]
KeyringMode=shared
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/usr/libexec/citadel-mount rootfs ExecStart=/usr/libexec/citadel-boot rootfs

5
meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-setup.service
View File

@ -8,8 +8,7 @@ Before=initrd-root-fs.target shutdown.target
AssertPathExists=/etc/initrd-release AssertPathExists=/etc/initrd-release
[Service] [Service]
KeyringMode=shared
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/usr/libexec/citadel-mount overlay ExecStart=/usr/libexec/citadel-boot setup
ExecStart=/usr/libexec/citadel-mount kernel
ExecStart=/usr/libexec/citadel-mount extra