Added a check for REQUIRED_PROGS_FDRUPSTREAM

rear · Oct 12, 2015 · 5e31e80 · 5e31e80
1 parent c84c36e
commit 5e31e80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
@@ -375,6 +375,9 @@ COPY_AS_IS_FDRUPSTREAM=( "$FDRUPSTREAM_INSTALL_PATH" )
 COPY_AS_IS_EXCLUDE_FDRUPSTREAM=( "$FDRUPSTREAM_INSTALL_PATH/usserver" )
 #CHECK_CONFIG_FILES_FDRUPSTREAM=( "$FDRUPSTREAM_INSTALL_PATH/upstream.cfg" "$FDRUPSTREAM_INSTALL_PATH/uscmd1" "$FDRUPSTREAM_INSTALL_PATH/usdaemon2" )
 PROGS_FDRUPSTREAM=( )
+# Check for just one program, to ensure that FDRUPSTREAM_INSTALL_PATH is
+# set correctly:
+REQUIRED_PROGS_FDRUPSTREAM=( "$FDRUPSTREAM_INSTALL_PATH/uscmd1" )
 
 ##
 # BACKUP=GALAXY stuff

diff --git a/usr/share/rear/prep/FDRUPSTREAM/default/40_prep_fdrupstream.sh b/usr/share/rear/prep/FDRUPSTREAM/default/40_prep_fdrupstream.sh
@@ -6,3 +6,4 @@ COPY_AS_IS=( "${COPY_AS_IS[@]}" "${COPY_AS_IS_FDRUPSTREAM[@]}" "${FDRUPSTREAM_IN
 COPY_AS_IS_EXCLUDE=( "${COPY_AS_IS_EXCLUDE[@]}" "${COPY_AS_IS_EXCLUDE_FDRUPSTREAM[@]}" "${FDRUPSTREAM_INSTALL_PATH}/usserver" )
 CHECK_CONFIG_FILES=( "${CHECK_CONFIG_FILES[@]}" "${CHECK_CONFIG_FILES_FDRUPSTREAM[@]}" )
 PROGS=( "${PROGS[@]}" "${PROGS_FDRUPSTREAM[@]}" col )
+REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" "${REQUIRED_PROGS_FDRUPSTREAM[@]}" col )