summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_syslinux2
-rwxr-xr-xhelpers/lh_bootstrap_cache3
-rwxr-xr-xhelpers/lh_chroot_local-packages11
-rwxr-xr-xhelpers/lh_config4
4 files changed, 17 insertions, 3 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 1f77ce8ca..968d25081 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -381,7 +381,7 @@ case "${LH_BINARY_IMAGES}" in
if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
then
rm -f binary/isolinux/splash.rle
- sed -e "s/.*splash.*//" binary/isolinux/boot.txt
+ sed -i -e "s/.*splash.*//" binary/isolinux/boot.txt
else
cp -f "${LH_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
fi
diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache
index e6c8dcc9f..8d811a92f 100755
--- a/helpers/lh_bootstrap_cache
+++ b/helpers/lh_bootstrap_cache
@@ -90,6 +90,9 @@ do
then
${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
fi
+
+ # Creating stage file
+ Create_stagefile .stage/bootstrap_cache.save
fi
;;
esac
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 1a084d519..96565a2fb 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -53,8 +53,15 @@ then
Restore_cache cache/packages_local-packages
# Copying packages
- cp config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root
- cp config/chroot_local-packages/*_all.deb chroot/root
+ if ls config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
+ then
+ cp config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root
+ fi
+
+ if ls config/chroot_local-packages/*_all.deb > /dev/null 2>&1
+ then
+ cp config/chroot_local-packages/*_all.deb chroot/root
+ fi
# Installing packages
Chroot "find /root -name *.deb" > chroot/root/local-packages
diff --git a/helpers/lh_config b/helpers/lh_config
index 1f551f7dc..43633a066 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -899,6 +899,10 @@ LH_NET_SERVER="${LH_NET_SERVER}"
# (Default: empty)
LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
+# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
+# (Default: 0)
+LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT}"
+
# \$LH_USERNAME: set username
# (Default: ${LH_USERNAME})
LH_USERNAME="${LH_USERNAME}"