Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init: mount /var instead of systemd var.mount service #1554

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/sysutils/busybox/package.mk
Expand Up @@ -211,7 +211,6 @@ post_install() {
enable_service debug-shell.service
enable_service shell.service
enable_service show-version.service
enable_service var.mount
enable_service var-log-debug.service
enable_service fs-resize.service

Expand Down
5 changes: 4 additions & 1 deletion packages/sysutils/busybox/scripts/init
Expand Up @@ -25,6 +25,7 @@
/usr/bin/busybox mkdir -p /proc
/usr/bin/busybox mkdir -p /sys
/usr/bin/busybox mkdir -p /tmp
/usr/bin/busybox mkdir -p /var
/usr/bin/busybox mkdir -p /flash
/usr/bin/busybox mkdir -p /sysroot
/usr/bin/busybox mkdir -p /storage
Expand All @@ -33,6 +34,7 @@
/usr/bin/busybox mount -t devtmpfs devtmpfs /dev
/usr/bin/busybox mount -t proc proc /proc
/usr/bin/busybox mount -t sysfs sysfs /sys
/usr/bin/busybox mount -t tmpfs none /var

# common functions
. /functions
Expand Down Expand Up @@ -1043,9 +1045,10 @@
/usr/bin/busybox mount --move /dev /sysroot/dev
/usr/bin/busybox mount --move /proc /sysroot/proc
/usr/bin/busybox mount --move /sys /sysroot/sys
/usr/bin/busybox mount --move /var /sysroot/var
/usr/bin/busybox rm -fr /tmp

# tell OE settings addon to disable updates
# tell LibreELEC Settings addon to disable updates
if [ "$UPDATE_DISABLED" = "yes" ] ; then
echo "" > /sysroot/dev/.update_disabled
fi
Expand Down
1 change: 0 additions & 1 deletion packages/sysutils/busybox/system.d/var-log-debug.service
@@ -1,7 +1,6 @@
[Unit]
Description=Debug /var/log relink
DefaultDependencies=false
After=var.mount
Before=systemd-journal-flush.service
ConditionKernelCommandLine=!installer
ConditionKernelCommandLine=|debugging
Expand Down
22 changes: 0 additions & 22 deletions packages/sysutils/busybox/system.d/var.mount

This file was deleted.

1 change: 0 additions & 1 deletion packages/sysutils/tz/system.d/tz-data.service
Expand Up @@ -2,7 +2,6 @@
Description=Setup Timezone data
DefaultDependencies=no
Before=systemd-udevd.service
After=var.mount

[Service]
Type=oneshot
Expand Down