From 3f38af7379073a4b6a848dcc4bccf7114e7dacfc Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 15 Jan 2019 14:13:56 -0500 Subject: [PATCH] Don't fail units if plymouth calls fail --- .../files/citadel-install-rootfs-mount.service | 2 +- .../files/citadel-install-rootfs-setup.service | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service index bbb0544..d837baa 100644 --- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service +++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service @@ -21,6 +21,6 @@ Before=citadel-rootfs-setup.service [Service] Type=oneshot 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-mount rootfs diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service index c8d7c40..938776e 100644 --- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service +++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service @@ -14,6 +14,6 @@ ConditionKernelCommandLine=|citadel.live [Service] Type=oneshot 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 -ExecStartPost=/usr/bin/plymouth message --text="Starting desktop" +ExecStartPost=-/usr/bin/plymouth message --text="Starting desktop"