keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postprocess: Add ostree-finalize-staged.path

Browse Source 
In preparations for https://github.com/ostreedev/ostree/pull/1740, just
hard enable this path unit for now since centrally-maintained distro
presets still need to be updated.

Closes: #1617
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-10-15 11:15:44 -04:00 committed by Atomic Bot
parent 05cb34d6b4
commit cdda3a01ba
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libpriv/rpmostree-postprocess.c
View File

@ -1014,7 +1014,9 @@ rpmostree_postprocess_final (int rootfs_dfd,
if (!glnx_shutil_mkdir_p_at (rootfs_dfd, preset_dir, 0755, cancellable, error))
return FALSE;
{ g_autofree char *preset_path = g_build_filename (preset_dir, "40-rpm-ostree-auto.preset", NULL);
static const char remount_preset[] = "# Written by rpm-ostree compose tree\nenable ostree-remount.service\n";
static const char remount_preset[] = "# Written by rpm-ostree compose tree\n"
"enable ostree-remount.service\n"
"enable ostree-finalize-staged.path\n";
if (!glnx_file_replace_contents_at (rootfs_dfd, preset_path, (guint8*)remount_preset,
strlen (remount_preset),
GLNX_FILE_REPLACE_NODATASYNC,

1
tests/compose-tests/test-basic.sh
View File

@ -32,6 +32,7 @@ echo "ok autovar"
ostree --repo=${repobuild} cat ${treeref} /usr/lib/systemd/system-preset/40-rpm-ostree-auto.preset > preset.txt
assert_file_has_content preset.txt '^enable ostree-remount.service$'
assert_file_has_content preset.txt '^enable ostree-finalize-staged.path$'
prepare_compose_test "from-yaml"
python <<EOF