From e2a0632e318d54e7c6a066b4b7d1278f1a26e84d Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 5 Apr 2018 00:14:16 +0200 Subject: [PATCH] Fix severals problems --- .../etc-machine\\x2did.mount" | 1 - .../hassio-zram.target.wants/zram-run.service | 1 - .../etc/systemd/system/tmp.mount.d/zram.conf | 8 +++++--- .../lib/systemd/system/etc-machine\\x2did.mount" | 16 ---------------- .../usr/lib/systemd/system/hassio-zram.target | 1 - .../usr/lib/systemd/system/var.mount | 3 ++- .../usr/lib/systemd/system/zram-run.service | 3 ++- .../usr/lib/systemd/system/zram-swap.service | 3 ++- .../usr/lib/systemd/system/zram-tmp.service | 3 ++- .../usr/lib/systemd/system/zram-var.service | 3 ++- 10 files changed, 15 insertions(+), 27 deletions(-) delete mode 120000 "buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-machine\\x2did.mount" delete mode 120000 buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-run.service delete mode 100644 "buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount" diff --git "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-machine\\x2did.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-machine\\x2did.mount" deleted file mode 120000 index d363626bb..000000000 --- "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-machine\\x2did.mount" +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/etc-machine\x2did.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-run.service b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-run.service deleted file mode 120000 index 87d18b37d..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-zram.target.wants/zram-run.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/zram-run.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/tmp.mount.d/zram.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/tmp.mount.d/zram.conf index 7f076f40f..1930b77a5 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/tmp.mount.d/zram.conf +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/tmp.mount.d/zram.conf @@ -1,9 +1,11 @@ [Unit] -Requires=zram-swap.service -After=zram-swap.service +Requires=zram-tmp.service +After=zram-tmp.service [Mount] What= -What=/dev/zram0 +What=/dev/zram2 Type= Type=ext4 +Options= +Options=nobarrier,strictatime,nosuid,nodev diff --git "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount" "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount" deleted file mode 100644 index 83c69d7e2..000000000 --- "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount" +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Systemd persistent machine-id -DefaultDependencies=no -Requires=mnt-overlay.mount -After=mnt-overlay.mount -Before=umount.target systemd-machine-id-commit.service -Conflicts=umount.target - -[Mount] -What=/mnt/overlay/etc/machine-id -Where=/etc/machine-id -Type=None -Options=bind - -[Install] -WantedBy=hassio-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target index 89f191025..35fd5050c 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-zram.target @@ -1,4 +1,3 @@ [Unit] Description=Hassio zram targets Documentation=man:systemd.target(5) -Before=sysinit.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount index 0a2bcb226..fa327ae98 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var.mount @@ -7,9 +7,10 @@ Before=umount.target Conflicts=umount.target [Mount] -What=/dev/zram2 +What=/dev/zram1 Where=/var Type=ext4 +Options=nobarrier [Install] WantedBy=local-fs.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service index 5c9d0d46d..95e51d4cb 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service @@ -1,9 +1,10 @@ [Unit] Description=Hassio ZRAM run +DefaultDependencies=no [Service] Type=oneshot -ExecStart=/sbin/hassio-zram -t sf -m run -s 16M +ExecStart=/sbin/hassio-zram -t fs -m run -s 16M RemainAfterExit=true [Install] 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 67263f938..c511cfee0 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 @@ -1,5 +1,6 @@ [Unit] -Description=Hassio ZRAM swap +Description=Hassio ZRAM +DefaultDependencies=no Before=dev-zram0.swap [Service] 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 735c53378..5ad52be4a 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 @@ -1,10 +1,11 @@ [Unit] Description=Hassio ZRAM tmp +DefaultDependencies=no Before=tmp.mount [Service] Type=oneshot -ExecStart=/sbin/hassio-zram -t sf -m tmp -s 16M +ExecStart=/sbin/hassio-zram -t fs -m tmp -s 16M RemainAfterExit=true [Install] 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 b2c81d09d..aac07c5b9 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 @@ -1,10 +1,11 @@ [Unit] Description=Hassio ZRAM var +DefaultDependencies=no Before=var.mount [Service] Type=oneshot -ExecStart=/sbin/hassio-zram -t sf -m var -s 32M +ExecStart=/sbin/hassio-zram -t fs -m var -s 32M RemainAfterExit=true [Install]