Skip to content

Commit

Permalink
Revert "eos-test-mode: Remount eos-live overlays in some services' na…
Browse files Browse the repository at this point in the history
…mespace"

This reverts commit 28e58e8.

The underlying bug in ostree was fixed in
endlessm/ostree#214, a backport of
ostreedev/ostree#3292.

With that change, eos-test-mode's overmounted overlayfses propagate
correctly to NetworkManager and AccountsService, so they no longer need
to be restarted. And restarting NetworkManager triggers a bug in Initial
Setup, which does not correctly handle this case and so never lists
available Wi-Fi networks.

https://phabricator.endlessm.com/T35640
  • Loading branch information
wjt committed Sep 9, 2024
1 parent 2797071 commit 5d9bc9a
Showing 1 changed file with 0 additions and 12 deletions.
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

0 comments on commit 5d9bc9a

Please sign in to comment.