add test if mksquashfs is available, remove unused code

faiproject · Apr 17, 2015 · 40de66c · 40de66c
1 parent 7ce2af0
commit 40de66c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/bin/fai-cd b/bin/fai-cd
@@ -286,9 +286,6 @@ burniso() {
 # - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main program
 
-rsync=0
-if [ -x "$(which rsync)" ] ; then rsync=1 ; fi
-
 # Parse commandline options
 while getopts "nkfhHg:JbSBMm:C:d:" opt ; do
     case "$opt" in
@@ -324,8 +321,8 @@ if [ $bootonly -eq 0 ]; then
     [ $(id -u) != "0" ]   && die 9 "Run this program as root."
 fi
 
-[ -x "$(which xorriso)" ] || die 8 "xorriso not found. Please install package."
-
+[ $squash_only -eq 1 -o -x "$(which xorriso)" ] || die 8 "xorriso not found. Please install package."
+[ -x "$(which mksquashfs)" ] || die 8 "mksquashfs not found. Please install the package mksquashfs-tools."
 [ -x "$(which strings)" ] || die 8 "command strings not found. Please install package binutils."
 
 # use FAI_ETC_DIR from environment variable