[PATCH 0/4] Fixes and start using baserock-system-config-sync on upgrades
by Tiago Gomes
repo: ssh://git@git.baserock.org/baserock/baserock/morph
branch: baserock/tiagogomes/bscs-sync
commit: 31bdbc428ac777ef2bb64818c69c4e84c3291891
Tiago Gomes (4):
Don't dereference the default symbolic link when updating it
Unmount the remote mouting point instead of the root disk
Add a missing trailing slash to the source directory of rsync
Run the merge mode of baserock-system-config-sync when upgrading
running systems.
morphlib/exts/ssh-rsync.write | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
--
1.7.10.4
9 years, 11 months
[PATCH 0/2] Timestamp deployment extension output
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8043-timestamp-extension-output
Sha1: b767433fbe754e71581c0404f9fb3b0ac6d49c38
Land: master
Note that people running morph from git will have deployment extension
output disappear, since a bleeding-edge cliapp is required.
You should upgrade your Baserock system, but as a stop-gap you can
hot-patch it with the following command
sed -i.bak -e '118s/len(argv)/len(argvs)/' \
/usr/lib/python2.7/site-packages/cliapp/runcmd.py
Richard Maw (2):
deploy_plugin: Timestamp output of extensions
Write extensions: Flush output when using status()
morphlib/plugins/deploy_plugin.py | 4 +++-
morphlib/writeexts.py | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
--
1.7.10.4
9 years, 11 months
[PATCH 0/7] Merge user changes to /etc in the new deployed version
by Tiago Gomes
repo: git://git.baserock.org/baserock/baserock/morph
branch: baserock/tiagogomes/bscs-sync
commit: 584fe9e80fb9956e30c51f50215b8775731ab342
Tiago Gomes (7):
Initial script to merge and syncronize /etc in different system
versions
Add a script to mount the systems directory of the running system.
Don't dereference the default symbolic link when updating it
Unmount the remote mouting point instead of the root disk
Add a script to mount the systems directory of the running system.
Add a merge mode to the baserock-system-config-sync script
Run the update /etc script when upgrading running systems.
morphlib/exts/ssh-rsync.write | 28 +++-
morphlib/plugins/deploy_plugin.py | 9 ++
scripts/baserock-system-config-sync | 138 ++++++++++++++++++++
scripts/mount-system-versions-dir | 25 ++++
.../tests.upgrades.dir.symb/vu/1 | 1 +
.../tests.upgrades.etc/v1/sshd_config | 123 +++++++++++++++++
.../tests.upgrades.etc/v2/sshd_config | 123 +++++++++++++++++
.../tests.upgrades.etc/vu/sshd_config | 123 +++++++++++++++++
.../tests.upgrades.regular.symb/vu/1 | 1 +
.../tests.upgrades.symblinks/v1/sl1 | 1 +
.../tests.upgrades.symblinks/v1/sl2 | 1 +
.../tests.upgrades.symblinks/v1/sl3 | 1 +
.../tests.upgrades.symblinks/v2/sl1 | 1 +
.../tests.upgrades.symblinks/v2/sl3 | 1 +
.../tests.upgrades.symblinks/v2/sl4 | 1 +
.../tests.upgrades.symblinks/vu/sl1 | 1 +
.../tests.upgrades.symblinks/vu/sl2 | 1 +
.../tests.upgrades.symblinks/vu/sl4 | 1 +
.../tests.upgrades/v1/file1 | 2 +
.../tests.upgrades/v1/file4 | 2 +
.../tests.upgrades/v1/file5 | 2 +
.../tests.upgrades/v1/file7 | 2 +
.../tests.upgrades/v1/file7.1 | 8 ++
.../tests.upgrades/v1/subdir1/subfile1 | 10 ++
.../tests.upgrades/v2/file1 | 2 +
.../tests.upgrades/v2/file2 | 2 +
.../tests.upgrades/v2/file3 | 2 +
.../tests.upgrades/v2/file4 | 2 +
.../tests.upgrades/v2/file5 | 2 +
.../tests.upgrades/v2/file6 | 2 +
.../tests.upgrades/v2/file7 | 2 +
.../tests.upgrades/v2/file7.1 | 8 ++
.../tests.upgrades/v2/subdir1/subfile1 | 10 ++
.../tests.upgrades/vu/file2 | 2 +
.../tests.upgrades/vu/file5 | 2 +
.../tests.upgrades/vu/file6 | 2 +
.../tests.upgrades/vu/file7 | 2 +
37 files changed, 644 insertions(+), 2 deletions(-)
create mode 100755 scripts/baserock-system-config-sync
create mode 100755 scripts/mount-system-versions-dir
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.dir.symb/vu/1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.dir.symb/vu/afile
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.etc/v1/sshd_config
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.etc/v2/sshd_config
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.etc/vu/sshd_config
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.regular.dir/v1/1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.regular.dir/v2/1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.regular.symb/v1/1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.regular.symb/v2/1
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.regular.symb/vu/1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.regular.symb/vu/afile
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/v1/sl1
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/v1/sl2
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/v1/sl3
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.symblinks/v1f
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/v2/sl1
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/v2/sl3
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/v2/sl4
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.symblinks/v2f
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/vu/sl1
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/vu/sl2
create mode 120000 tests/sync-config-folder-tests/tests.upgrades.symblinks/vu/sl4
create mode 100644 tests/sync-config-folder-tests/tests.upgrades.symblinks/vuf
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/file1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/file4
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/file5
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/file7
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/file7.1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/subdir1/subfile1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file2
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file3
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file4
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file5
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file6
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file7
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/file7.1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/subdir1/subfile1
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/vu/file2
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/vu/file5
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/vu/file6
create mode 100644 tests/sync-config-folder-tests/tests.upgrades/vu/file7
--
1.7.10.4
9 years, 11 months
Add timestamps to deploy status messages
by Richard Dale
repo: baserock:baserock/morph
ref: baserock/richarddale/S8043-deploy-timestamps
SHA1: 236d0509b69899193f5c40b660330a2d8bb569ef
Land: master
This patch fixes RT #116 and adds timestamps to status messages output by the deploy plugin and other write extensions
9 years, 11 months
[PATCH 0/4] Morph: remove support for system-kind
by Lars Wirzenius
repo: git://git.baserock.org/baserock/baserock/morph
branch: liw/remove-nonrootfs-system-kinds
commit: dbbaf636b5b169b508703e597eea0eaebe38c439
This removes support for system-kind. We haven't used those for a couple
of releases now. The system-kind morphology field is allowed, but only if
it's empty or contains "rootfs-tarball", in which case it causes a warning
to be printed. Any other value causes an error.
Lars Wirzenius (4):
Delete system-kind plugins except for rootfs-tarball
Require system-kind to be rootfs-tarball
Remove SystemKindBuilderFactory
Fix warnings and test suite
morphlib/app.py | 2 -
morphlib/builder2.py | 251 ++++----------------
morphlib/morphologyfactory.py | 24 +-
morphlib/morphologyfactory_tests.py | 6 +-
morphlib/plugins/disk-systembuilder_plugin.py | 27 --
.../plugins/syslinux-disk-systembuilder_plugin.py | 96 --------
morphlib/plugins/tarball-systembuilder_plugin.py | 86 -------
7 files changed, 62 insertions(+), 430 deletions(-)
delete mode 100644 morphlib/plugins/disk-systembuilder_plugin.py
delete mode 100644 morphlib/plugins/syslinux-disk-systembuilder_plugin.py
delete mode 100644 morphlib/plugins/tarball-systembuilder_plugin.py
--
1.7.9-rc0
9 years, 11 months
