diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-10 08:44:31 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:07 +0100 |
| commit | a4ab9bb0e5995e736f7a935438f22e5edb0db134 (patch) | |
| tree | 4c67c05198a5c430247d886751760becb65f0b29 | |
| parent | 2bc0dad3fb1c5ee2a182dc2170c7245d8242ac12 (diff) | |
| download | vyos-live-build-a4ab9bb0e5995e736f7a935438f22e5edb0db134.tar.gz vyos-live-build-a4ab9bb0e5995e736f7a935438f22e5edb0db134.zip | |
Updating win32-loader pathes for squeeze (Closes: #580952).
| -rwxr-xr-x | helpers/binary_win32-loader | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/helpers/binary_win32-loader b/helpers/binary_win32-loader index e0a7bc780..bf4eb6c33 100755 --- a/helpers/binary_win32-loader +++ b/helpers/binary_win32-loader @@ -44,10 +44,20 @@ Create_lockfile .lock case "${LH_ARCHITECTURE}" in amd64|i386) + case "${LH_DISTRIBUTION}" in + lenny) + WIN32_LOADER="/usr/lib/win32-loader" + ;; + + *) + WIN32_LOADER="/usr/share/win32-loader" + ;; + esac + if [ "${LH_CHROOT_BUILD}" = "true" ] then # Checking depends - Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader + Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader # Restoring cache Restore_cache cache/packages_binary @@ -56,13 +66,18 @@ case "${LH_ARCHITECTURE}" in Install_package # Copying win32-loader - cp chroot/usr/lib/win32-loader/* binary + cp chroot/${WIN32_LOADER}/* binary else - cp /usr/lib/win32-loader/* binary + cp ${WIN32_LOADER}/* binary fi mv binary/win32-loader.exe binary/setup.exe + if [ -e binary/win32-loader-standalone.exe ] + then + mv binary/win32-loader-standalone.exe binary/setup-standalone.exe + fi + if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then |