From ae0a2fe264cf8de8fd152862b3554e3a96a18e74 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 29 Nov 2018 16:01:16 +0000 Subject: [PATCH] OS: move service scripts into libexec --- .../usr/lib/systemd/system/hassos-apparmor.service | 2 +- .../rootfs-overlay/usr/lib/systemd/system/hassos-expand.service | 2 +- .../usr/lib/systemd/system/hassos-persists-journald.service | 2 +- .../rootfs-overlay/usr/lib/systemd/system/rauc-mark.service | 2 +- .../rootfs-overlay/usr/lib/systemd/system/zram-swap.service | 2 +- .../rootfs-overlay/usr/lib/systemd/system/zram-tmp.service | 2 +- .../rootfs-overlay/usr/lib/systemd/system/zram-var.service | 2 +- .../rootfs-overlay/usr/{sbin => libexec}/hassos-apparmor | 0 .../rootfs-overlay/usr/{sbin => libexec}/hassos-expand | 0 .../usr/{sbin => libexec}/hassos-persists-journald | 0 .../rootfs-overlay/usr/{sbin => libexec}/hassos-rate | 0 .../rootfs-overlay/usr/{sbin => libexec}/hassos-zram | 1 + 12 files changed, 8 insertions(+), 7 deletions(-) rename buildroot-external/rootfs-overlay/usr/{sbin => libexec}/hassos-apparmor (100%) rename buildroot-external/rootfs-overlay/usr/{sbin => libexec}/hassos-expand (100%) rename buildroot-external/rootfs-overlay/usr/{sbin => libexec}/hassos-persists-journald (100%) rename buildroot-external/rootfs-overlay/usr/{sbin => libexec}/hassos-rate (100%) rename buildroot-external/rootfs-overlay/usr/{sbin => libexec}/hassos-zram (99%) diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service index 82934470a..9c6a3c5a3 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service @@ -7,7 +7,7 @@ RequiresMountsFor=/mnt/data [Service] Type=oneshot RemainAfterExit=true -ExecStart=/usr/sbin/hassos-apparmor +ExecStart=/usr/libexec/hassos-apparmor [Install] WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service index cc50a0bf2..07e453bde 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service @@ -7,7 +7,7 @@ RefuseManualStop=true [Service] Type=oneshot -ExecStart=/usr/sbin/hassos-expand +ExecStart=/usr/libexec/hassos-expand RemainAfterExit=true [Install] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-persists-journald.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-persists-journald.service index 0f98b1fae..1a19fa6b0 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-persists-journald.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-persists-journald.service @@ -7,7 +7,7 @@ RefuseManualStop=true [Service] Type=oneshot -ExecStart=/usr/sbin/hassos-persists-journald +ExecStart=/usr/libexec/hassos-persists-journald RemainAfterExit=true [Install] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service index 01d62f8c6..1c22ee576 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service @@ -5,5 +5,5 @@ RefuseManualStop=true [Service] Type=oneshot -ExecStart=/usr/sbin/hassos-rate +ExecStart=/usr/libexec/hassos-rate RemainAfterExit=true diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service index 93cad3868..8ec712237 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service @@ -7,7 +7,7 @@ RefuseManualStop=true [Service] Type=oneshot -ExecStart=/usr/sbin/hassos-zram -t swap +ExecStart=/usr/libexec/hassos-zram -t swap RemainAfterExit=true StandardOutput=null diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service index b4e9d6862..6fb88e68e 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service @@ -7,7 +7,7 @@ RefuseManualStop=true [Service] Type=oneshot -ExecStart=/usr/sbin/hassos-zram -t fs -m tmp -s 16M +ExecStart=/usr/libexec/hassos-zram -t fs -m tmp -s 16M RemainAfterExit=true StandardOutput=null diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service index 410f9b6fd..bb0c1fb2c 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service @@ -7,7 +7,7 @@ RefuseManualStop=true [Service] Type=oneshot -ExecStart=/usr/sbin/hassos-zram -t fs -m var -s 32M +ExecStart=/usr/libexec/hassos-zram -t fs -m var -s 32M RemainAfterExit=true StandardOutput=null diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-apparmor b/buildroot-external/rootfs-overlay/usr/libexec/hassos-apparmor similarity index 100% rename from buildroot-external/rootfs-overlay/usr/sbin/hassos-apparmor rename to buildroot-external/rootfs-overlay/usr/libexec/hassos-apparmor diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-expand b/buildroot-external/rootfs-overlay/usr/libexec/hassos-expand similarity index 100% rename from buildroot-external/rootfs-overlay/usr/sbin/hassos-expand rename to buildroot-external/rootfs-overlay/usr/libexec/hassos-expand diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-persists-journald b/buildroot-external/rootfs-overlay/usr/libexec/hassos-persists-journald similarity index 100% rename from buildroot-external/rootfs-overlay/usr/sbin/hassos-persists-journald rename to buildroot-external/rootfs-overlay/usr/libexec/hassos-persists-journald diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-rate b/buildroot-external/rootfs-overlay/usr/libexec/hassos-rate similarity index 100% rename from buildroot-external/rootfs-overlay/usr/sbin/hassos-rate rename to buildroot-external/rootfs-overlay/usr/libexec/hassos-rate diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-zram b/buildroot-external/rootfs-overlay/usr/libexec/hassos-zram similarity index 99% rename from buildroot-external/rootfs-overlay/usr/sbin/hassos-zram rename to buildroot-external/rootfs-overlay/usr/libexec/hassos-zram index 3012cba80..a08eaf5cb 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-zram +++ b/buildroot-external/rootfs-overlay/usr/libexec/hassos-zram @@ -68,3 +68,4 @@ fi if [ "$TYPE" = "fs" ]; then mkfs.ext4 -L "hassos-$MOUNT" -O ^has_journal "$DEVICE" fi +