Create linux dm-snapshots via separate c++-program

.gitignore

@@ -231,44 +231,81 @@ urbackup/server_ident_ecdsa409k1.priv
 urbackup/server_ident_ecdsa409k1.pub
 clientctl/Debug/*
 urbackup/new_version_deb/*
-
-urbackupserver/www/js/templates.js.new
-urbackupserver/www/templates.js.new
-clientctl/Release/*
-urbackup/UrBackupUpdate.sig2
-backup_scripts/*
-.vs/UrBackupBackend/v14/.suo
-clientctl/x64/*
-UrBackupBackend.VC.opendb
-deps/
-urbackup/backup_server_*.db*
-urbackup_ecdsa409k1.pub
-urbackup/UrBackupUpdateLinux.sh
-urbackup/UrBackupUpdateLinux.sig2
-urbackup/UrBackupUpdateMac.sh
-urbackup/UrBackupUpdateMac.sig2
-urbackupserver/www/templates/node_modules/.bin/dustc
-SQLGen/SQLGen.VC.opendb
-SQLGen/.vs/*
-SQLGen/SQLGen.VC.db
-SQLGen/SQLGen.VC.VC.opendb
-UrBackupBackend.VC.db
-UrBackupBackend.VC.VC.opendb
-urbackup/version_linux.txt
-urbackup/version_osx.txt
-urbackup/hdat_file_*_.dat
-urbackup/windows_components_config/*
-SQLGen/x64/*
-luaplugin/x64/*
-blockalign/x64/*
-/.vs/*
-/blockalign_src/Debug/*
-/blockalign_src/x64/*
-/build/__pycache__/*
-/blockalign/Debug/*
-/luaplugin/Debug/*
-/urbackupserver/www/templates/post/*
-/vcpkg_installed
-/urbackupserver/Release
-/blockalign_src/Release
-/luaplugin/Release
+
+urbackupserver/www/js/templates.js.new
+urbackupserver/www/templates.js.new
+clientctl/Release/*
+urbackup/UrBackupUpdate.sig2
+backup_scripts/*
+.vs/UrBackupBackend/v14/.suo
+clientctl/x64/*
+UrBackupBackend.VC.opendb
+deps/
+urbackup/backup_server_*.db*
+urbackup_ecdsa409k1.pub
+urbackup/UrBackupUpdateLinux.sh
+urbackup/UrBackupUpdateLinux.sig2
+urbackup/UrBackupUpdateMac.sh
+urbackup/UrBackupUpdateMac.sig2
+urbackupserver/www/templates/node_modules/.bin/dustc
+SQLGen/SQLGen.VC.opendb
+SQLGen/.vs/*
+SQLGen/SQLGen.VC.db
+SQLGen/SQLGen.VC.VC.opendb
+UrBackupBackend.VC.db
+UrBackupBackend.VC.VC.opendb
+urbackup/version_linux.txt
+urbackup/version_osx.txt
+urbackup/hdat_file_*_.dat
+urbackup/windows_components_config/*
+SQLGen/x64/*
+luaplugin/x64/*
+blockalign/x64/*
+/.vs/*
+/blockalign_src/Debug/*
+/blockalign_src/x64/*
+/build/__pycache__/*
+/blockalign/Debug/*
+/luaplugin/Debug/*
+/urbackupserver/www/templates/post/*
+/vcpkg_installed
+/urbackupserver/Release
+/blockalign_src/Release
+/luaplugin/Release
+*.o
+autom4te.cache
+.deps
+.dirstamp
+cryptoplugin/src/m4/lt~obsolete.m4
+cryptoplugin/src/m4/ltoptions.m4
+cryptoplugin/src/m4/ltsugar.m4
+cryptoplugin/src/m4/ltversion.m4
+aclocal.m4
+blockalign
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.ac
+curr_build
+defaults
+depcomp
+init.d
+install-sh
+Makefile
+Makefile.am
+Makefile.in
+missing
+stamp-h1
+urbackupclient_dmsnaptool
+urbackupclientbackend
+urbackupclientctl
+cryptoplugin/src/local.h.in
+cryptoplugin/src/ltmain.sh
+cryptoplugin/src/Makefile.in
+cryptoplugin/src/missing
+cryptoplugin/src/m4/libtool.m4

Makefile.am_client

@@ -1,9 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4
 sbin_PROGRAMS = urbackupclientbackend
-if WITH_GUI_CLIENT
-bin_PROGRAMS = urbackupclientctl urbackupclientgui blockalign
-else
 bin_PROGRAMS = urbackupclientctl blockalign
+if WITH_GUI_CLIENT
+bin_PROGRAMS += urbackupclientgui
+endif
+if WITH_DMTOOL
+sbin_PROGRAMS += urbackupclient_dmsnaptool
 endif
 urbackupclientbackend_SOURCES = AcceptThread.cpp Client.cpp Database.cpp Query.cpp SelectThread.cpp Server.cpp ServerLinux.cpp ServiceAcceptor.cpp ServiceWorker.cpp SessionMgr.cpp StreamPipe.cpp Template.cpp WorkerThread.cpp main.cpp md5.cpp stringtools.cpp libfastcgi/fastcgi.cpp Mutex_lin.cpp LoadbalancerClient.cpp DBSettingsReader.cpp file_common.cpp file_fstream.cpp file_linux.cpp FileSettingsReader.cpp LookupService.cpp SettingsReader.cpp Table.cpp OutputStream.cpp ThreadPool.cpp MemoryPipe.cpp Condition_lin.cpp MemorySettingsReader.cpp sqlite/shell.c SQLiteFactory.cpp PipeThrottler.cpp mt19937ar.cpp DatabaseCursor.cpp SharedMutex_lin.cpp StaticPluginRegistration.cpp common/data.cpp common/adler32.cpp OpenSSLPipe.cpp
 
@@ -121,6 +123,15 @@ if !WITH_ASSERTIONS
 urbackupclientctl_CPPFLAGS=-DNDEBUG
 endif
 
+if WITH_DMTOOL
+urbackupclient_dmsnaptool_SOURCES = dmsnaptool/main.cpp stringtools.cpp
+urbackupclient_dmsnaptool_LDADD = -ldevmapper
+urbackupclient_dmsnaptool_LDFLAGS = 
+if !WITH_ASSERTIONS
+urbackupclient_dmsnaptool_CPPFLAGS=-DNDEBUG
+endif
+endif
+
 if MACOSX
 urbackupclientgui_osx_SOURCES = client/osxutils.mm
 else

configure.ac_client

@@ -232,5 +232,14 @@ AS_IF([test "x$opsys" != "xosx"],
 		[AC_MSG_FAILURE([No library for clock_gettime found])] )
 ])
 
+AC_CHECK_LIB(devmapper, dm_task_set_name, [HAVE_LIB_DEVICEMAPPER=1])
+AS_IF([test "x$HAVE_LIB_DEVICEMAPPER" = "x"],
+	[
+		AC_MSG_WARN([
+				Did not find libdevmapper. Not compiling UrBackup dmsnapshot tool. Dm-snapshot method will not be available.
+				])
+	])
+AM_CONDITIONAL([WITH_DMTOOL], [test x$HAVE_LIB_DEVICEMAPPER = x1])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

create_linux_installer.sh

@@ -146,6 +146,13 @@ do
 	cp blockalign install-data/$arch/
 	cp blockalign install-data-dbg/$arch/
 	$STRIP_CMD install-data/$arch/blockalign
+
+	if test -e urbackupclient_dmsnaptool
+	then
+		cp urbackupclient_dmsnaptool install-data/$arch/
+		cp urbackupclient_dmsnaptool install-data-dbg/$arch/
+		$STRIP_CMD install-data/$arch/urbackupclient_dmsnaptool
+	fi
 
 	export PATH="$ORIG_PATH"
 	./switch_build.sh client