diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:26 +0100 |
| commit | ba2322bb2b453a848dccb7f80fbe5d72b373926e (patch) | |
| tree | 92ae03973981067aea007213d056abbbc6388abb /helpers | |
| parent | 8c3178682beafb9c71df5310b3f975728359b833 (diff) | |
| download | vyos-live-build-ba2322bb2b453a848dccb7f80fbe5d72b373926e.tar.gz vyos-live-build-ba2322bb2b453a848dccb7f80fbe5d72b373926e.zip | |
Adding live-helper 1.0~a26-1.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_syslinux | 2 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cache | 3 | ||||
| -rwxr-xr-x | helpers/lh_chroot_local-packages | 11 | ||||
| -rwxr-xr-x | helpers/lh_config | 4 |
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}" |