diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2013-03-07 22:04:24 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | 20855871d2c62c36ee19d5a38a017d0f66bb88fa (patch) | |
| tree | 7756bf7c4ee1653c04a4cce3fe41678c714cafe2 | |
| parent | c1a7b496bf3f275ee7b419c8ae04d68735c020ee (diff) | |
| download | vyos-live-build-20855871d2c62c36ee19d5a38a017d0f66bb88fa.tar.gz vyos-live-build-20855871d2c62c36ee19d5a38a017d0f66bb88fa.zip | |
Fixing win32-loader.ini by including the GTK related entries.
The check protecting their addition was wrong. Also fix the actual keys
with the correct architecture instead of hardcoding i386.
| -rwxr-xr-x | scripts/build/binary_win32-loader | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index bfe0393f2..36ee6128a 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -79,16 +79,16 @@ cat > binary/win32-loader.ini << EOF kernel=linux arch=${LIVE_IMAGE_ARCHITECTURE} default_desktop=gnome -i386/linux=install/vmlinuz -i386/initrd=install/initrd.gz +${LIVE_IMAGE_ARCHITECTURE}/linux=install/vmlinuz +${LIVE_IMAGE_ARCHITECTURE}/initrd=install/initrd.gz EOF - if [ -e install/gtk ] + if [ -e binary/install/gtk ] then cat >> binary/win32-loader.ini << EOF -i386/gtk/linux=install/vmlinuz -i386/gtk/initrd=install/gtk/initrd.gz +${LIVE_IMAGE_ARCHITECTURE}/gtk/linux=install/vmlinuz +${LIVE_IMAGE_ARCHITECTURE}/gtk/initrd=install/gtk/initrd.gz EOF fi |