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

Revert "eos-test-mode: Remount eos-live overlays in some services' namespace" #414

Merged
merged 1 commit into from
Sep 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions eos-test-mode
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,3 @@ systemctl mask --runtime --now eos-autoupdater.timer eos-autoupdater.service

# Disable phoning home for this boot, too
systemctl mask --runtime --now eos-phone-home.{service,timer,path}

# Restart systemd services which mount real storage blocks to the paths under
# /sysroot/ directly. This helps them remount the eos-live overlays in their
# namespace. This is caused by ostree making the /sysroot mount private.
# https://phabricator.endlessm.com/T35625
pattern='$1 ~ "^/dev/" && $2 ~ "^/sysroot/"'
action='{split(FILENAME, p, "/"); print p[3]; nextfile}'
awk "$pattern $action" /proc/*/mounts | uniq | while read -r pid;
do
service=$(systemctl whoami $pid)
systemctl restart $service
done