From 245401492bf652fdce75b816acfcab0d315ffc88 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 20 Nov 2018 18:44:02 +0100 Subject: [PATCH] importer: make clear that /conf/config.xml is required --- src/man/man8/opnsense-importer.8 | 7 ++++++- src/sbin/opnsense-importer | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/man/man8/opnsense-importer.8 b/src/man/man8/opnsense-importer.8 index 0769d5e6b..d34dc202d 100644 --- a/src/man/man8/opnsense-importer.8 +++ b/src/man/man8/opnsense-importer.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Sep 8, 2018 +.Dd November 20, 2018 .Dt OPNSENSE-IMPORTER 8 .Os .Sh NAME @@ -39,6 +39,11 @@ The .Nm utility can import a previous configuration from multiple types of disk formats. +A normal system directory layout using +.Pa /conf +is expected with at least +.Pa /conf/config.xml +present. If successful, the old configuration will be replaced. .Pp The diff --git a/src/sbin/opnsense-importer b/src/sbin/opnsense-importer index f937af09a..782b89c3f 100755 --- a/src/sbin/opnsense-importer +++ b/src/sbin/opnsense-importer @@ -299,7 +299,7 @@ while : ; do # hooray, we're done! break else - echo "No previous configuration was found." + echo "The file /conf/config.xml could not be found." if [ -n "${DO_DEV}" ]; then bootstrap_and_exit 1