diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 7968b13155..498b0125de 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -185,7 +185,6 @@ post_install() { enable_service shell.service enable_service show-version.service enable_service var.mount - enable_service var-log-debug.service enable_service fs-resize.service listcontains "${FIRMWARE}" "rpi-eeprom" && enable_service rpi-flash-firmware.service diff --git a/packages/sysutils/busybox/system.d/storage-log.service b/packages/sysutils/busybox/system.d/storage-log.service new file mode 100644 index 0000000000..d27d0a31df --- /dev/null +++ b/packages/sysutils/busybox/system.d/storage-log.service @@ -0,0 +1,9 @@ +[Unit] +Description=Create Persistent Log Directory on /storage +DefaultDependencies=no +RequiresMountsFor=/storage + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/mkdir -p /storage/.cache/log/journal diff --git a/packages/sysutils/busybox/system.d/var-log-debug.service b/packages/sysutils/busybox/system.d/var-log-debug.service deleted file mode 100644 index a8e9efc0fd..0000000000 --- a/packages/sysutils/busybox/system.d/var-log-debug.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Debug /var/log relink -DefaultDependencies=false -After=var.mount -Before=systemd-journal-flush.service -ConditionKernelCommandLine=!installer -ConditionKernelCommandLine=|debugging -ConditionPathExists=|/storage/.cache/debug.libreelec - -[Service] -Type=oneshot -ExecStartPre=/bin/rm -rf /var/log -ExecStartPre=-/bin/mkdir -p /storage/log/journal -ExecStart=-/bin/ln -sf /storage/log /var/log -RemainAfterExit=yes - -[Install] -WantedBy=sysinit.target diff --git a/packages/sysutils/busybox/system.d/var-log.mount b/packages/sysutils/busybox/system.d/var-log.mount new file mode 100644 index 0000000000..e6b6ebf88b --- /dev/null +++ b/packages/sysutils/busybox/system.d/var-log.mount @@ -0,0 +1,13 @@ +[Unit] +Description=Persistent Log Storage +RequiresMountsFor=/var /storage +Requires=storage-log.service +After=storage-log.service +ConditionKernelCommandLine=!installer +ConditionKernelCommandLine=|debugging +ConditionPathExists=|/storage/.cache/debug.libreelec + +[Mount] +What=/storage/.cache/log +Where=/var/log +Options=bind