summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-03-12 19:26:10 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:43 +0100
commitfb314b164ff32a09b0f01996f414a50041c87fe6 (patch)
tree678ec72484eef76fc614c0f34cf006da1d227a31
parent8a3dd8cfe02db31b452a137c340ba2577f573330 (diff)
downloadvyos-live-build-fb314b164ff32a09b0f01996f414a50041c87fe6.tar.gz
vyos-live-build-fb314b164ff32a09b0f01996f414a50041c87fe6.zip
Only trying to handle syslinux help screens if they are actually available.
-rwxr-xr-xhelpers/lh_binary_syslinux33
1 files changed, 21 insertions, 12 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 42eb1d519..94fae106d 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -201,24 +201,33 @@ Copy_syslinux_templates ()
fi
fi
- for FILE in ${SCREEN_PATH}/*.live
- do
- mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
- done
-
- if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+ if ls ${SCREEN_PATH}/*.live > /dev/null 2>&1
then
- for FILE in ${SCREEN_PATH}/*.install
+ for FILE in ${SCREEN_PATH}/*.live
do
- mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
+ mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
done
+ fi
+
+ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+ then
+ if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1
+ then
+ for FILE in ${SCREEN_PATH}/*.install
+ do
+ mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
+ done
+ fi
case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc)
- for FILE in ${SCREEN_PATH}/*.install.g-i
- do
- mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
- done
+ if ls ${SCREEN_PATH}/*.install.g-i > /dev/null 2>&1
+ then
+ for FILE in ${SCREEN_PATH}/*.install.g-i
+ do
+ mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
+ done
+ fi
;;
*)