summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-09-25 16:34:19 +0200
committerHarald Welte <laforge@gnumonks.org>2018-09-25 20:05:02 +0200
commit81bfef931a35771bcf1b7164b3370ae851821678 (patch)
tree25cb5c0564da36c86ba2a6664d1b1cf9fcde200c /debian
parent8515d035ae09edf3ad4d6e0dcbe526eee8bce3eb (diff)
Add new osmo-config-merge utility
This utility allows you to merge an incremental config "patch" into an osmocom-style config file. The patch file follows the same syntax as the original config file. It works by appending the leaf nodes of the patch file to the respective nodes of the input config file. This process allows configuration file changes/updates to be performed in a more stable/reliable way than by means of [unified] diff files, as they break every time the context lines break. osmo-config-merge doesn't suffer from this problem, as it understands the tree-like nature of VTY config files. NITE: This only works with configuration files that have proper indenting, i.e. every level in the hierarchy must be indented excatly one character, not multiple. Change-Id: I61997a3668cc3a40d12ca023272f6d782e6fbefe
Diffstat (limited to 'debian')
-rw-r--r--debian/control3
-rw-r--r--debian/libosmocore-utils.install1
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 540a8b5e..33ae2d42 100644
--- a/debian/control
+++ b/debian/control
@@ -315,7 +315,8 @@ Multi-Arch: same
Description: Utilities for gsm
This package contains a program for frequency calculation for GSM called
'osmo-arfcn' and a program called 'osmo-auc-gen' that is used for testing GSM
- authentication.
+ authentication, as well as 'osmo-config-merge', a tool for merging Osmocom
+ configuration files.
.
They use the libosmocore library. The libosmocore library contain various
utility functions that were originally developed as part of the OpenBSC
diff --git a/debian/libosmocore-utils.install b/debian/libosmocore-utils.install
index 9c3b8dce..d23cc73a 100644
--- a/debian/libosmocore-utils.install
+++ b/debian/libosmocore-utils.install
@@ -1,2 +1,3 @@
usr/bin/osmo-arfcn
usr/bin/osmo-auc-gen
+usr/bin/osmo-config-merge