Skip to content
Snippets Groups Projects
Commit 8243546a authored by Walter Lozano's avatar Walter Lozano Committed by Emanuele Aina
Browse files

Remove repeated line in system updates and rollback


Remove a line that was repeated by mistake in system updates and rollback.

Signed-off-by: default avatarWalter Lozano <walter.lozano@collabora.com>
parent 5120ff26
No related branches found
No related tags found
1 merge request!209Small fixes related how to deal with configuration files during updates
...@@ -806,7 +806,6 @@ this provides the new content that will be used for the read-only portions of ...@@ -806,7 +806,6 @@ this provides the new content that will be used for the read-only portions of
the rootfs, but does not modify the read-write parts. the rootfs, but does not modify the read-write parts.
To handle the upgrade of system settings stored in `/etc`, a copy of its To handle the upgrade of system settings stored in `/etc`, a copy of its
default values are kept in `/usr/etc` which is updated with the new commit. default values are kept in `/usr/etc` which is updated with the new commit.
default values is kept in `/usr/etc` which is updated with the new commit.
Thanks to this information `OSTree` can detect the files that have been changed Thanks to this information `OSTree` can detect the files that have been changed
and apply a 3-way merge, to update the `/etc`. and apply a 3-way merge, to update the `/etc`.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment