diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:48:46 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:48:46 +0200 |
| commit | d1047e809a90daa0e88329efc0db21931be0b919 (patch) | |
| tree | 5dc92aaaeb4d15dcad4796935b90a9675be93ad5 /scripts/build/binary_win32-loader | |
| parent | 160d6bade79bf58a1c0d1842dc9b55ec178ec303 (diff) | |
| download | vyos-live-build-d1047e809a90daa0e88329efc0db21931be0b919.tar.gz vyos-live-build-d1047e809a90daa0e88329efc0db21931be0b919.zip | |
Adding debian version 4.0~a1-1.debian/4.0_a1-1
Diffstat (limited to 'scripts/build/binary_win32-loader')
| -rwxr-xr-x | scripts/build/binary_win32-loader | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index a46e06213..4789398a1 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org> ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -63,43 +63,28 @@ 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 -cat >> binary/autorun.inf << EOF -[autorun] -open=setup.exe -EOF + 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 if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then cat > binary/win32-loader.ini << EOF [installer] -kernel=linux arch=${LB_ARCHITECTURES} -default_desktop=gnome -${LB_ARCHITECTURES}/linux=install/vmlinuz -${LB_ARCHITECTURES}/initrd=install/initrd.gz -EOF - - if [ -e binary/install/gtk ] - then - -cat >> binary/win32-loader.ini << EOF -${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz -${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz -EOF - - fi - -cat >> binary/win32-loader.ini << EOF +i386/linux=install/vmlinuz +i386/initrd=install/initrd.gz +i386/gtk/linux=install/vmlinuz +i386/gtk/initrd=install/gtk/initrd.gz [grub] g2ldr=g2ldr |