summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Modify the way to use 'patch' in 'baserock-system-config-sync'.Pedro Alvarez2014-02-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baserock-sytem-config-sync: Changes here are caused by a bug found in GNU patch managing the permissions of the files when using the patch command like: patch <file_to_apply_patch> -t -o <output_file> To reproduce the bug: echo foo > file1 echo bar > file2 diff -u file1 file2 | patch 1 -t -o file3 ls -l You can check that the permissions of 'file3' are different than the permissions of 'file1' or 'file2'. To avoid the bug, this patch changes the way we are using patch, using it as following: patch <file_to_apply_patch> -t Since the output file is not specified, the output file will be the file in which we want to apply the patch. And due we cannot specify the output file, we are copying the file to the destination directory, and then applying the patch there. As a consequence of changing the way of using patch, now 'patch' generates an extra file when patching fails. This file is added in the test suite also in this commit.
| * Update 'baserock-system-config-sync' tests to check permissionsPedro Alvarez2014-02-201-2/+30
|/
* Merge branch 'benbrown/bscs-non-baserock'Ben Brown2014-01-061-10/+10
|\
| * Add options to diff command to change header content to only include file ↵Ben Brown2014-01-061-2/+2
| | | | | | | | name, and explicitly ask for a unified diff
| * Removed 'local' from variables that are not within functionsBen Brown2014-01-061-8/+8
|/
* Merge branch 'benbrown/S9537/convert-xattribute-tests'Ben Brown2014-01-0621-839/+144
|\
| * Remove old tests and any code specific to those testsBen Brown2013-12-1919-839/+2
| |
| * Scenarios testing extended attributes on file systems that support themBen Brown2013-12-182-0/+83
| |
| * Add newlines to increase readabilityBen Brown2013-12-171-0/+59
|/
* Merge branch 'benbrown/S9482/convert-socket-tests'Ben Brown2013-12-163-4/+88
|\
| * Socket scenarios addedBen Brown2013-12-161-3/+44
| |
| * Add socket creation program to MakefileBen Brown2013-12-161-1/+2
| |
| * Added C program which creates named Unix socketsBen Brown2013-12-161-0/+42
|/
* Merge branch 'benbrown/S9462/convert-device-tests'Ben Brown2013-12-111-10/+55
|\
| * Chardev and blockdev scenarios addedBen Brown2013-11-191-10/+55
|/
* Merge branch 'benbrown/S9561/scenario-language'Ben Brown2013-11-191-176/+172
|\
| * Modified yarn to be more readable, IMPLEMENTS made "cleaner"Ben Brown2013-11-141-176/+172
|/
* Merge branch 'benbrown/S9451/convert-directory-tests'Ben Brown2013-11-0611-142/+218
|\
| * Symtime now compiles at 'make', rather than 'make check'Ben Brown2013-11-051-1/+1
| |
| * Conversion of tbdiff directory testsBen Brown2013-11-0510-141/+217
|/ | | | | | Disabled (renamed) old tests that have been converted Removed compilation instruction for symtime.c from README
* Merge branch 'benbrown/S9423/convert-symlink-tests'Ben Brown2013-11-014-75/+204
|\
| * Updated the README to reflect changes made.Ben Brown2013-11-011-2/+16
| |
| * Makefile.am now creates helper binary on make check and executes yarnsBen Brown2013-11-011-0/+5
| |
| * Added symlink scenarios and a C program that changes the mtimes of symlinks.Ben Brown2013-11-012-73/+183
|/
* Merge branch 'benbrown/yarns'Ben Brown2013-10-291-46/+94
|\
| * Conversion of fifo tbdiff tests to yarnBen Brown2013-10-281-46/+94
|/ | | | Also changed the time of last modification scenarios to use timestamps.
* Merge remote-tracking branch 'remotes/origin/benbrown/yarns'Lars Wirzenius2013-10-251-4/+98
|\
| * Conversion of tbdiff test '00_regular_file_diff.sh' to yarnBen Brown2013-10-251-4/+98
|/
* Merge branch 'benbrown/yarns'Ben Brown2013-10-244-0/+67
|\
| * Add new Yarn based test suiteBen Brown2013-10-244-0/+67
|/ | | | | | | | This introduces a yarn which demonstrates testing tbdiff. Also included is a shell library to assist with writing yarn based tests, a script for running the test suite and a simple README for executing the tests.
* Change the temporary directory used for tests to be based on the current ↵Tiago Gomes2013-07-011-1/+3
| | | | | | | directory Or else the test using extended attributes will fail because extended attributes are not supported in tmpfs.
* Remove test mode and provide hooks to use a test suite.Tiago Gomes2013-07-01222-33/+1003
| | | | | | | | | Tests will now be handled by a test suite in a future commit, so this mode will not be needed anymore. The test suite will work by replacing the mounting script by a fake mounting script that points to a directory with a systems folder. Also add trap again, now that it is more tested.
* Impromevements to baserock-system-configTiago Gomes2013-07-014-44/+57
| | | | | | | | | | | - Check if file is the same kind in all versions before attempt to patch it. - Use the batch mode in patch command, as the script will be executed remotely - Remove the use of the trap for now. It was not well test and it was causing the old directories to not be removed.
* Script to merge and syncronize /etc in different system versionsTiago Gomes2013-06-2549-1/+725
| | | | | | | | | | | | | | | | | | | | This commit adds a script to merge and syncronize /etc in different system versions. The first argument read from command line is the mode, which can be one of the following: - test: the purpose of this mode is to test some merge cases. It receives from the command line v1_dir, vu_dir and v2_dir and vt_dir. The meaning of these arguments is explained in the script. - merge: merges the user changes in /etc in the run system of the version given as argument - sync: syncronizes /etc in all run versions, so that this directory is exactly the same as the version given as argument. This commit also includes an auxiliary script to mount the systems directory in a give directory given as argument, and some testing folders to use with the test mode.
* Add a few btrfs filesystem sync calls for debugging.Jannis Pohlmann2012-03-272-2/+9
|
* Rename tbdiff-switch to tb-switch.Jannis Pohlmann2012-03-274-5/+5
|
* Rename tbdiff-update to tb-update.Jannis Pohlmann2012-03-274-5/+5
|
* Clear traps before exiting, explicitly umount before reboot.Jannis Pohlmann2012-03-262-6/+18
| | | | The sync calls should not be needed, so I'm dropping them as well.
* Use busybox sync instead of sync alone.Jannis Pohlmann2012-03-262-2/+2
|
* Add sync at the end of tbdiff-{update,switch}.Jannis Pohlmann2012-03-232-0/+6
|
* Fix various runtime issues in tbdiff-switch.Jannis Pohlmann2012-03-231-7/+1
|
* Add a new tbdiff-switch command to switch a system to a new subvolume.Jannis Pohlmann2012-03-234-0/+102
|
* Call 'busybox reboot' at the end of tbdiff-update to reboot the system.Jannis Pohlmann2012-03-231-0/+3
|
* Hard-code more stuff (rm, mktemp) to busybox.Jannis Pohlmann2012-03-231-2/+2
|
* Hard-code buysbox cp and sed for now.Jannis Pohlmann2012-03-231-4/+4
|
* Add new tbdiff-update command to apply a patch to a system.Jannis Pohlmann2012-03-234-1/+134
| | | | | | | | | | | | | | | This command is written in bash and takes four parameters: * a device with a btrfs file system to mount * the source subvolume name * the target subvolume name * the path to a patch file or stream It then creates the target subvolume as a snapshot of the source subvolume, applies the patch in there, then creates a <target>-run snapshot and copies the boot files (vmlinuz, extlinux.conf) to the root file system. Lastly, it adjusts extlinux.conf to point to the -run snapshot.
* Switch to the autotools build system in tbdiff.morph.Jannis Pohlmann2012-03-231-6/+1
|
* Switch to a shared tbdiff library and make this an autotools project.Jannis Pohlmann2012-03-2227-87/+509
| | | | | | | | | | | | | | | | | | | | | | | | | This commit converts tbdiff to being an autotools-based project. This means that we now support the usual autoreconf -i && ./configure && make && make install process, plus we provide 'make check' for the tbdiff test suite. The tbdiff library is now build as a shared library and is also installed into the system for others to use. The library is libtool-versioned and ships a pkg-config file (tbdiff-1.pc). The headers were adjusted so that only tbdiff/tbdiff.h may be included directly; all others are considered internal. The tbdiff-create and tbdiff-deploy tools were changed to include this header file. The tbdiff library is still GPL, not LGPL. We might want to change this in the future. Thanks to switching to autotools we now have a way to make releases by means of 'make dist' and 'make distcheck'. Unfortunately, the latter currently fails, probably due to something being missing in tbdiff/Makefile.am.
* Add tbdiff.morph and DESTDIR support to Makefile.Jannis Pohlmann2012-03-192-4/+18
|
* Patch problem fixed! Still a problem with patch 7.Danny Abukalam2012-01-2711-25/+21
|