summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2013-01-02 11:42:18 +0100
committerDaniel Baumann <daniel@debian.org>2013-01-02 11:42:18 +0100
commit8d31e413f811c95554d7b1289c8fac6cb006083d (patch)
tree573f3e5daafc64aa2527c6309564099d0e126bff /scripts
parent369a6005099ad1cb99ea5bf4da02a24f2550672d (diff)
downloadvyos-live-build-8d31e413f811c95554d7b1289c8fac6cb006083d.tar.gz
vyos-live-build-8d31e413f811c95554d7b1289c8fac6cb006083d.zip
Dropping pre-squeeze handling for win32-loader files.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_win32-loader9
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 576629a60..267abcb1a 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -63,18 +63,15 @@ case "${LB_ARCHITECTURES}" in
fi
mv binary/win32-loader.exe binary/setup.exe
+ mv binary/win32-loader/g2ldr* binary
+ rmdir binary/win32-loader > /dev/null 2>&1 || true
if [ -e binary/win32-loader-standalone.exe ]
then
+ # squeeze
mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
fi
- if ls binary/win32-loader/g2ldr* > /dev/null 2>&1
- then
- mv binary/win32-loader/g2ldr* binary
- rmdir binary/win32-loader > /dev/null 2>&1 || true
- fi
-
cat >> binary/autorun.inf << EOF
[autorun]
open=setup.exe