Hi dear Release Team, hi Otavio,
Please unblock win32-loader 0.6.18. Squeeze actually has Lenny's version and
win32-loader saw many changes, led by Robert Millan and then somehow by myself,
which include:
* A _lot_ of new translations
* basic kFreeBSD support
* Reduced code duplication with nsis
* New win32-loader-standalone.exe, ready to be used from http
* New maintainer (Robert is essentially MIA and not reachable by email)
* Lots of bugfixes
The huge debdiff is attached:
$ debdiff win32-loader_0.6.1{0,8}.dsc | filterdiff -x "*.po" > win32-
loader_0.6.10_0.6.18.debdiff
(Note also that 0.6.19 only ships new translations, and is "pending").
TIA !
OdyX
--
Didier Raboud, proud Debian Maintainer (DM).
CH-1020 Renens
didier@raboud.com
diff -Nru win32-loader-0.6.10/debian/changelog win32-loader-0.6.18/debian/changelog
--- win32-loader-0.6.10/debian/changelog 2009-01-18 13:07:50.000000000 +0100
+++ win32-loader-0.6.18/debian/changelog 2010-08-03 20:57:42.000000000 +0200
@@ -1,3 +1,175 @@
+win32-loader (0.6.18) unstable; urgency=low
+
+ [ Updated translations ]
+ - Galician (Jorge Barreiro)
+ - Kazakh (Baurzhan Muftakhidinov). Closes: #587208
+ (Still not activated, no NSIS translation)
+ - Traditional Chinese (Tetralet). Closes: #494361, #513917
+ - Bosnian added (Armin Beširović)
+ - Esperanto fixed (LANG_ESPERANTO)
+ - Danish added (Joe Hansen). Closes: #591103
+ - Asturian added (Marcos Alvarez Costales). Closes: #511625
+ (Not activated, no NSIS translation)
+
+ [ Christian Perrier ]
+ * Activate Bosnian translation
+ * Activate Arabic translation (supported in NSIS 2.46)
+ * Activate Esperanto translation (supported in NSIS 2.46)
+ * Activate Irish translation (supported in NSIS 2.46)
+ * Activate Slovenian translation (supported in NSIS 2.46)
+ * Activate Ukrainian translation (supported in NSIS 2.46)
+ * Update versioned build dependency on nsis to 2.43 (introduction
+ of Esperanto)
+
+ [ Didier Raboud ]
+ * Call makensis verbosely.
+ * Vietnamese is not activated; document that in l10n/Makefile
+ * Bump Standards to 3.9.1.0 without changes needed.
+
+ -- Didier Raboud <didier@raboud.com> Tue, 03 Aug 2010 20:57:36 +0200
+
+win32-loader (0.6.17) unstable; urgency=low
+
+ [ Updated translations ]
+ - Bulgarian (Damyan Ivanov)
+ - Czech (Miroslav Kure)
+ - German (Holger Wansing). Closes: #580755
+ - Norwegian Bokmal (Hans Fredrik Nordhaug)
+ - Portuguese (Miguel Figueiredo)
+ - Slovak (Ivan Masár)
+ - Simplified Chinese (YunQiang Su)
+ - Thai (Theppitak Karoonboonyanan)
+ - Romanian (Andrei Popescu)
+
+ * Specify grub-mkimage's --format to i386-pc (Closes: #584371)
+
+ -- Didier Raboud <didier@raboud.com> Thu, 03 Jun 2010 14:12:11 +0200
+
+win32-loader (0.6.16) unstable; urgency=low
+
+ * Add basic kFreeBSD support (Closes: #579742)
+ + What works: fetching and booting a kFreeBSD d-i from standalone version
+ - What doesn't: preseeding, stable install, g-i, media install
+
+ * Move files to /usr/share/win32/ to be consistent with other win32 packages.
+ * Sync linux bootparam VIDEO_MODE definition with rest of d-i
+ - Revert the grub.cfg generation code update (aka s/vga=/set gfxpayload/g)
+
+ -- Didier Raboud <didier@raboud.com> Wed, 05 May 2010 18:28:39 +0200
+
+win32-loader (0.6.15) unstable; urgency=low
+
+ * Update the daily images URLs.
+ * Remove hardcoded release codenames.
+ * Remove the getwindowsversion.nsh code duplicate (included in nsis).
+ - Take the opportunity to widen Windows version conditions.
+ * Separate network (with a http shipped preseed.cfg) from standalone
+ functionality (completely lonely executable).
+ * Store the old boot.ini timeout value. Closes: #476777
+ * Update the grub.cfg generation code to cope with recent grub-pc
+ (aka s/vga=/set gfxpayload/g)
+ * Update Build-Dependency on cpio-win32 to >= 2.11-4 to fix initramfs
+ preseed.cfg embedding which broke the installer boot.
+
+ * Add myself to copyright files.
+ * Add the DM-Upload-Allowed field to debian/control.
+
+ -- Didier Raboud <didier@raboud.com> Fri, 30 Apr 2010 10:00:00 +0200
+
+win32-loader (0.6.14) unstable; urgency=high
+
+ [ Updated translations ]
+ - Simplified Chinese (苏运强).
+ - German (Holger Wansing). Closes: #566567
+ - Slovak (Ivan Masár). Closes: #568370
+ - Bengali (Sadia Afroz).
+ - Vietnamese (Clytie Siddall). Closes: #568978
+ - Japanese.
+ - Tamil added (but not activated as not supported in NSIS)
+ Closes: #578501.
+
+ [ Didier Raboud ]
+ * Add myself to Uploaders.
+ * Add mingw32-runtime to Build-Depends. Closes: #569389
+ - Urgency high for RC bug fixing.
+ * Convert packaging to tiny debhelper style.
+ - Drop cdbs B-D, bump debhelper B-D version and compat.
+ * Use 3.0 (native) source format.
+ * Provide the standalone version. Closes: #464233
+ * Point to specific GPL version in debian/copyright
+ * Rewrite description. Closes: #578567
+ * Add Vcs-* fields to debian/control.
+ * Bump Standards to 3.8.4 without changes needed.
+
+ -- Christian Perrier <bubulle@debian.org> Fri, 23 Apr 2010 07:14:40 +0200
+
+win32-loader (0.6.13) unstable; urgency=low
+
+ [ Robert Millan ]
+ * Update for GRUB module rename. (Closes: #545648)
+ * Make all strings distro-agnostic.
+ * Include vbe.mod for video mode initialization.
+ * Move grub.cfg to win32-loader directory.
+ * Make it buildable with nsis 2.25 again.
+ * Split functionality back into different plugins. svn-bisect reveals
+ that the plugin split (r57832) is correlated to the memory
+ corruption problem on Win98, see #538762 for details.
+ * Ditch grubutil-win32 dependency.
+
+ [ Updated translations ]
+ * Catalan (ca.po) by Robert Millan
+ * French (fr.po) by Christian Perrier
+ * Norwegian Bokmal (nb.po) by Hans Fredrik Nordhaug
+ * Russian (ru.po) by Yuri Kozlov (Closes: #558467)
+ * Thai (th.po) by Theppitak Karoonboonyanan
+ * Vietnamese (vi.po) by Clytie Siddall
+
+ -- Robert Millan <rmh.debian@aybabtu.com> Mon, 30 Nov 2009 16:39:15 +0100
+
+win32-loader (0.6.12) unstable; urgency=low
+
+ * Detect (but don't yet enable) Windows 7.
+ * Update GRUB module selection. (Closes: #536961)
+ * Build with gcc-mingw32.
+
+ [ Updated translations ]
+ * Catalan (ca.po) by Jordi Mallach.
+ * Japanese (ja.po) by Hideki Yamane, commited by Kenshi Muto.
+ * Bengali (bn.po) by Md. Rezwan Shahid
+ * Czech (cs.po) by Miroslav Kure
+ * Spanish (es.po) by Javier Fernández-Sanguino
+ * Italian (it.po) by Milo Casagrande
+ * Slovak (sk.po) by Ivan Masár
+ * Turkish (tr.po) by Mert Dirik
+
+ -- Robert Millan <rmh.debian@aybabtu.com> Fri, 21 Aug 2009 22:26:27 +0200
+
+win32-loader (0.6.11) unstable; urgency=low
+
+ * Remove kludge for etch support.
+ * Merge all plugin code into a single DLL.
+ * Update to new NSIS plugin API. (Closes: #517174)
+ * Update my email address.
+
+ [ Added translations ]
+ * Kazakh (kk.po) by Dauren Sarsenov. Closes: #520999
+ This language is not activated yet because NSIS is not
+ translated.
+ * Bengali (bn.po) by Rezwan Shahid
+ This language is not activated yet because NSIS is not
+ translated.
+
+ [ Updated translations ]
+ * Belarusian (be.po) by Pavel Piatruk
+ * German (de.po) by Jan Keller
+ * Esperanto (eo.po) by Felipe Castro
+ * Kazakh (kk.po) by Dauren Sarsenov
+ * Bokmål, Norwegian (nb.po) by Hans Fredrik Nordhaug
+ * Russian (ru.po) by Yuri Kozlov (Closes: #522653)
+ * Traditional Chinese (zh_TW.po) by Tetralet
+
+ -- Robert Millan <rmh.debian@aybabtu.com> Mon, 06 Apr 2009 21:02:05 +0200
+
win32-loader (0.6.10) unstable; urgency=low
* Scan for the System Partition and use it consistently. Fix problem that
diff -Nru win32-loader-0.6.10/debian/compat win32-loader-0.6.18/debian/compat
--- win32-loader-0.6.10/debian/compat 2008-03-14 22:55:49.000000000 +0100
+++ win32-loader-0.6.18/debian/compat 2010-04-28 14:29:34.000000000 +0200
@@ -1 +1 @@
-5
+7
diff -Nru win32-loader-0.6.10/debian/control win32-loader-0.6.18/debian/control
--- win32-loader-0.6.10/debian/control 2008-10-26 22:04:28.000000000 +0100
+++ win32-loader-0.6.18/debian/control 2010-08-01 16:01:28.000000000 +0200
@@ -2,28 +2,29 @@
Section: utils
Priority: extra
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Robert Millan <rmh@aybabtu.com>
+Uploaders: Robert Millan <rmh.debian@aybabtu.com>, Didier Raboud <didier@raboud.com>
+DM-Upload-Allowed: yes
Build-Depends:
- cdbs,
- debhelper (>= 5),
- nsis (>= 2.25),
- mingw32,
+ debhelper (>= 7.0.50),
+ nsis (>= 2.43),
+ gcc-mingw32, mingw32-runtime,
gettext,
- grub-pc (>= 1.96+20080724-10), grubutil-win32 (>= 1.1-18-3),
+ grub-pc (>= 1.97+20091130-1~),
loadlin (>= 1.6c.really1.6c.nobin-1~),
locales-all,
- cpio-win32 (>= 2.9-11), gzip-win32
-Standards-Version: 3.7.2
+ cpio-win32 (>= 2.11-4), gzip-win32
+Standards-Version: 3.9.1.0
+Vcs-Svn: svn://svn.debian.org/d-i/trunk/win32-loader/
+Vcs-Browser: http://svn.debian.org/wsvn/d-i/trunk/win32-loader/?op=log
Package: win32-loader
Architecture: all
-Depends: base-files (>= 4.0.1~)
+Depends: ${misc:Depends}, base-files (>= 4.0.1~)
Suggests: wine
Description: Debian-Installer loader for win32
This package provides a win32 program that can be used as a loader for
Debian Installer, acting as a more user-friendly boot mechanism than
traditional BIOS-based boot.
.
- It can act as a standalone netboot loader (for a practical example, see
- http://goodbye-microsoft.com/), or as a cdrom/usb-disk add-on that starts
- a media-based install.
+ This package contains both the cdrom/usb-disk add-on that starts a media-based
+ install and the standalone netboot loader.
diff -Nru win32-loader-0.6.10/debian/copyright win32-loader-0.6.18/debian/copyright
--- win32-loader-0.6.10/debian/copyright 2008-02-17 11:52:39.000000000 +0100
+++ win32-loader-0.6.18/debian/copyright 2010-04-28 14:29:33.000000000 +0200
@@ -4,7 +4,8 @@
The original source can always be found at:
http://ftp.debian.org/dists/unstable/main/source/
-Copyright (C) 2007,2008 Robert Millan
+Copyright (C) 2007,2008,2009 Robert Millan
+Copyright (C) 2010 Didier Raboud
License:
@@ -22,4 +23,4 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
diff -Nru win32-loader-0.6.10/debian/dirs win32-loader-0.6.18/debian/dirs
--- win32-loader-0.6.10/debian/dirs 2007-09-01 20:09:19.000000000 +0200
+++ win32-loader-0.6.18/debian/dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/win32-loader
diff -Nru win32-loader-0.6.10/debian/docs win32-loader-0.6.18/debian/docs
--- win32-loader-0.6.10/debian/docs 1970-01-01 01:00:00.000000000 +0100
+++ win32-loader-0.6.18/debian/docs 2010-04-28 14:29:33.000000000 +0200
@@ -0,0 +1 @@
+THANKS
diff -Nru win32-loader-0.6.10/debian/install win32-loader-0.6.18/debian/install
--- win32-loader-0.6.10/debian/install 2007-09-01 22:29:23.000000000 +0200
+++ win32-loader-0.6.18/debian/install 2010-05-05 18:22:42.000000000 +0200
@@ -1,3 +1,4 @@
-win32-loader.exe usr/lib/win32-loader
-g2ldr usr/lib/win32-loader
-g2ldr.mbr usr/lib/win32-loader
+win32-loader.exe usr/share/win32
+win32-loader-standalone.exe usr/share/win32
+g2ldr usr/share/win32/win32-loader
+g2ldr.mbr usr/share/win32/win32-loader
diff -Nru win32-loader-0.6.10/debian/rules win32-loader-0.6.18/debian/rules
--- win32-loader-0.6.10/debian/rules 2008-03-14 20:55:56.000000000 +0100
+++ win32-loader-0.6.18/debian/rules 2010-04-28 14:29:33.000000000 +0200
@@ -1,6 +1,15 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-# override "clean" in cdbs
-DEB_MAKE_CLEAN_TARGET = distclean
+%:
+ dh $@
+
+override_dh_auto_build:
+ # Build the standalone version
+ STANDALONE=yes dh_auto_build
+ mv win32-loader.exe win32-loader-standalone.exe
+ # Build the cdrom version
+ dh_auto_build
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f win32-loader-standalone.exe
diff -Nru win32-loader-0.6.10/debian/source/format win32-loader-0.6.18/debian/source/format
--- win32-loader-0.6.10/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ win32-loader-0.6.18/debian/source/format 2010-04-28 14:29:33.000000000 +0200
@@ -0,0 +1 @@
+3.0 (native)
diff -Nru win32-loader-0.6.10/genpif win32-loader-0.6.18/genpif
--- win32-loader-0.6.10/genpif 2008-03-05 19:42:20.000000000 +0100
+++ win32-loader-0.6.18/genpif 2010-04-28 14:29:34.000000000 +0200
@@ -1,14 +1,19 @@
#!/bin/bash -e
+# This script outputs a valid .pif "Program Information File"
+#
+# There is some documentation available there: http://www.smsoft.ru/en/pifdoc.htm
+
# supress dd stderr
exec 2>/dev/null
# hello, I am a PIF
echo -en "\x00\x78"
-# program name, displayed in the confirmation dialog (space-padded)
-echo -en "Debian Installer "
+# program name, displayed in the confirmation dialog (space-padded to 30)
+echo -en "Installer Loader "
+# Conventional memory limits
echo -en "\x80\x02\x00\x00"
# exec file (zero-padded)
diff -Nru win32-loader-0.6.10/getwindowsversion.nsh win32-loader-0.6.18/getwindowsversion.nsh
--- win32-loader-0.6.10/getwindowsversion.nsh 2009-01-03 23:16:47.000000000 +0100
+++ win32-loader-0.6.18/getwindowsversion.nsh 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-; Part of the NSIS package (obtained from /usr/share/doc/nsis/Docs/AppendixC.html)
-; For license terms see /usr/share/doc/nsis/copyright
-
-; GetWindowsVersion
-;
-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
-; Updated by Joost Verburg
-;
-; Returns on top of stack
-;
-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)
-; or
-; '' (Unknown Windows Version)
-;
-; Usage:
-; Call GetWindowsVersion
-; Pop $R0
-; ; at this point $R0 is "NT 4.0" or whatnot
-
-Function GetWindowsVersion
-
- Push $R0
- Push $R1
-
- ClearErrors
-
- ReadRegStr $R0 HKLM \
- "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-
- IfErrors 0 lbl_winnt
-
- ; we are not NT
- ReadRegStr $R0 HKLM \
- "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
-
- StrCpy $R1 $R0 1
- StrCmp $R1 '4' 0 lbl_error
-
- StrCpy $R1 $R0 3
-
- StrCmp $R1 '4.0' lbl_win32_95
- StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
-
- lbl_win32_95:
- StrCpy $R0 '95'
- Goto lbl_done
-
- lbl_win32_98:
- StrCpy $R0 '98'
- Goto lbl_done
-
- lbl_win32_ME:
- StrCpy $R0 'ME'
- Goto lbl_done
-
- lbl_winnt:
-
- StrCpy $R1 $R0 1
-
- StrCmp $R1 '3' lbl_winnt_x
- StrCmp $R1 '4' lbl_winnt_x
-
- StrCpy $R1 $R0 3
-
- StrCmp $R1 '5.0' lbl_winnt_2000
- StrCmp $R1 '5.1' lbl_winnt_XP
- StrCmp $R1 '5.2' lbl_winnt_2003
- StrCmp $R1 '6.0' lbl_vista lbl_error
-
- lbl_winnt_x:
- StrCpy $R0 "NT $R0" 6
- Goto lbl_done
-
- lbl_winnt_2000:
- Strcpy $R0 '2000'
- Goto lbl_done
-
- lbl_winnt_XP:
- Strcpy $R0 'XP'
- Goto lbl_done
-
- lbl_winnt_2003:
- Strcpy $R0 '2003'
- Goto lbl_done
-
- lbl_vista:
- Strcpy $R0 'Vista'
- Goto lbl_done
-
- lbl_error:
- Strcpy $R0 'XX'
- lbl_done:
-
- Pop $R1
- Exch $R0
-
-FunctionEnd
diff -Nru win32-loader-0.6.10/l10n/Makefile win32-loader-0.6.18/l10n/Makefile
--- win32-loader-0.6.10/l10n/Makefile 2009-01-18 13:02:58.000000000 +0100
+++ win32-loader-0.6.18/l10n/Makefile 2010-08-01 17:35:37.000000000 +0200
@@ -1,4 +1,7 @@
-LINGUAS=be bg ca cs de el en es eu fi fr gl he hr hu it ja ko lt nb nl pl pt pt_BR ro ru sk sq sv th tr zh_CN zh_TW
+# Add only languages really supported by NSIS there
+# For others, a PO file may be added and kept until NSIS is translated
+# Languages not yet supported by NSIS: ast bn dz kk ml vi
+LINGUAS= ar be bg bs ca cs de el en eo es eu fi fr ga gl he hr hu it ja ko lt nb nl pl pt pt_BR ro ru sk sl sq sv th tr uk zh_CN zh_TW
all: templates/all.nsh templates/dialog.nsh po/messages.pot
diff -Nru win32-loader-0.6.10/l10n/po/ar.po win32-loader-0.6.18/l10n/po/ar.po
diff -Nru win32-loader-0.6.10/l10n/po/ast.po win32-loader-0.6.18/l10n/po/ast.po
diff -Nru win32-loader-0.6.10/l10n/po/be.po win32-loader-0.6.18/l10n/po/be.po
diff -Nru win32-loader-0.6.10/l10n/po/bg.po win32-loader-0.6.18/l10n/po/bg.po
diff -Nru win32-loader-0.6.10/l10n/po/bn.po win32-loader-0.6.18/l10n/po/bn.po
diff -Nru win32-loader-0.6.10/l10n/po/bs.po win32-loader-0.6.18/l10n/po/bs.po
diff -Nru win32-loader-0.6.10/l10n/po/ca.po win32-loader-0.6.18/l10n/po/ca.po
diff -Nru win32-loader-0.6.10/l10n/po/cs.po win32-loader-0.6.18/l10n/po/cs.po
diff -Nru win32-loader-0.6.10/l10n/po/da.po win32-loader-0.6.18/l10n/po/da.po
diff -Nru win32-loader-0.6.10/l10n/po/de.po win32-loader-0.6.18/l10n/po/de.po
diff -Nru win32-loader-0.6.10/l10n/po/dz.po win32-loader-0.6.18/l10n/po/dz.po
diff -Nru win32-loader-0.6.10/l10n/po/el.po win32-loader-0.6.18/l10n/po/el.po
diff -Nru win32-loader-0.6.10/l10n/po/eo.po win32-loader-0.6.18/l10n/po/eo.po
diff -Nru win32-loader-0.6.10/l10n/po/es.po win32-loader-0.6.18/l10n/po/es.po
diff -Nru win32-loader-0.6.10/l10n/po/eu.po win32-loader-0.6.18/l10n/po/eu.po
diff -Nru win32-loader-0.6.10/l10n/po/fi.po win32-loader-0.6.18/l10n/po/fi.po
diff -Nru win32-loader-0.6.10/l10n/po/fr.po win32-loader-0.6.18/l10n/po/fr.po
diff -Nru win32-loader-0.6.10/l10n/po/ga.po win32-loader-0.6.18/l10n/po/ga.po
diff -Nru win32-loader-0.6.10/l10n/po/gl.po win32-loader-0.6.18/l10n/po/gl.po
diff -Nru win32-loader-0.6.10/l10n/po/he.po win32-loader-0.6.18/l10n/po/he.po
diff -Nru win32-loader-0.6.10/l10n/po/hr.po win32-loader-0.6.18/l10n/po/hr.po
diff -Nru win32-loader-0.6.10/l10n/po/hu.po win32-loader-0.6.18/l10n/po/hu.po
diff -Nru win32-loader-0.6.10/l10n/po/it.po win32-loader-0.6.18/l10n/po/it.po
diff -Nru win32-loader-0.6.10/l10n/po/ja.po win32-loader-0.6.18/l10n/po/ja.po
diff -Nru win32-loader-0.6.10/l10n/po/kk.po win32-loader-0.6.18/l10n/po/kk.po
diff -Nru win32-loader-0.6.10/l10n/po/ko.po win32-loader-0.6.18/l10n/po/ko.po
diff -Nru win32-loader-0.6.10/l10n/po/lt.po win32-loader-0.6.18/l10n/po/lt.po
diff -Nru win32-loader-0.6.10/l10n/po/messages.pot win32-loader-0.6.18/l10n/po/messages.pot
--- win32-loader-0.6.10/l10n/po/messages.pot 2009-01-03 23:10:25.000000000 +0100
+++ win32-loader-0.6.18/l10n/po/messages.pot 2010-05-05 18:04:28.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-03 22:10+0000\n"
+"POT-Creation-Date: 2010-05-05 16:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@
#. (e.g. cp437) should be used in this string. If you don't know which charset
#. applies, limit yourself to ascii.
#: win32-loader.sh:81
-msgid "Debian Installer"
+msgid "Continue with install process"
msgstr ""
#. translate:
@@ -66,7 +66,7 @@
msgstr ""
#: win32-loader.c:71
-msgid "Debian-Installer Loader"
+msgid "Installer Loader"
msgstr ""
#: win32-loader.c:72
@@ -99,7 +99,7 @@
msgid ""
"There doesn't seem to be enough free disk space in drive $c. For a complete "
"desktop install, it is recommended to have at least 3 GB. If there is "
-"already a separate disk or partition to install Debian, or if you plan to "
+"already a separate disk or partition for this install, or if you plan to "
"replace Windows completely, you can safely ignore this warning."
msgstr ""
@@ -113,12 +113,12 @@
#: win32-loader.c:79
msgid ""
-"The version of Debian you're trying to install is designed to run on modern, "
-"64-bit computers. However, your computer is incapable of running 64-bit "
+"The system version you're trying to install is designed to run on modern, 64-"
+"bit computers. However, your computer is incapable of running 64-bit "
"programs.\n"
"\n"
-"Use the 32-bit (\"i386\") version of Debian, or the Multi-arch version which "
-"is able to install either of them.\n"
+"Use the 32-bit (\"i386\") version, or the Multi-arch version which is able "
+"to install either of them.\n"
"\n"
"This installer will abort now."
msgstr ""
@@ -126,13 +126,13 @@
#: win32-loader.c:80
msgid ""
"Your computer is capable of running modern, 64-bit operating systems. "
-"However, the version of Debian you're trying to install is designed to run "
-"on older, 32-bit hardware.\n"
+"However, the system version you're trying to install is designed to run on "
+"older, 32-bit hardware.\n"
"\n"
"You may still proceed with this install, but in order to take the most "
"advantage of your computer, we recommend that you use the 64-bit (\"amd64\") "
-"version of Debian instead, or the Multi-arch version which is able to "
-"install either of them.\n"
+"version instead, or the Multi-arch version which is able to install either "
+"of them.\n"
"\n"
"Would you like to abort now?"
msgstr ""
@@ -149,7 +149,7 @@
"partition\" ($c)."
msgstr ""
-#: win32-loader.c:89 win32-loader.c:95
+#: win32-loader.c:89 win32-loader.c:98
msgid "Select install mode:"
msgstr ""
@@ -168,39 +168,51 @@
msgstr ""
#: win32-loader.c:93
-msgid "Install Debian GNU/Linux on this computer."
+msgid "Begin install on this computer."
msgstr ""
#: win32-loader.c:94
-msgid "Repair an existing Debian system (rescue mode)."
+msgid "Repair an installed system (rescue mode)."
+msgstr ""
+
+#: win32-loader.c:95
+msgid "Select the kernel:"
msgstr ""
#: win32-loader.c:96
-msgid "Graphical install"
+msgid "GNU/Linux"
msgstr ""
#: win32-loader.c:97
+msgid "GNU/kFreeBSD"
+msgstr ""
+
+#: win32-loader.c:99
+msgid "Graphical install"
+msgstr ""
+
+#: win32-loader.c:100
msgid "Text install"
msgstr ""
-#: win32-loader.c:98
+#: win32-loader.c:101
#, c-format
msgid "Downloading %s"
msgstr ""
-#: win32-loader.c:99
+#: win32-loader.c:102
msgid "Connecting ..."
msgstr ""
-#: win32-loader.c:100
+#: win32-loader.c:103
msgid "second"
msgstr ""
-#: win32-loader.c:101
+#: win32-loader.c:104
msgid "minute"
msgstr ""
-#: win32-loader.c:102
+#: win32-loader.c:105
msgid "hour"
msgstr ""
@@ -210,29 +222,29 @@
#. has been proposed [1] but in the meantime we'll have to cope with this.
#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
#.
-#: win32-loader.c:110
+#: win32-loader.c:113
msgid "s"
msgstr ""
-#: win32-loader.c:111
+#: win32-loader.c:114
#, c-format
msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
msgstr ""
-#: win32-loader.c:112
+#: win32-loader.c:115
#, c-format
msgid " (%d %s%s remaining)"
msgstr ""
-#: win32-loader.c:113
+#: win32-loader.c:116
msgid "Select which version of Debian-Installer to use:"
msgstr ""
-#: win32-loader.c:114
+#: win32-loader.c:117
msgid "Stable release. This will install Debian \"stable\"."
msgstr ""
-#: win32-loader.c:115
+#: win32-loader.c:118
msgid ""
"Daily build. This is the development version of Debian-Installer. It will "
"install Debian \"testing\" by default, and may be capable of installing "
@@ -242,79 +254,79 @@
#. translate:
#. You might want to mention that so-called "known issues" page is only available in English.
#.
-#: win32-loader.c:120
+#: win32-loader.c:123
msgid ""
"It is recommended that you check for known issues before using a daily "
"build. Would you like to do that now?"
msgstr ""
-#: win32-loader.c:121
+#: win32-loader.c:124
msgid "Desktop environment:"
msgstr ""
-#: win32-loader.c:122
+#: win32-loader.c:125
msgid "None"
msgstr ""
-#: win32-loader.c:123
+#: win32-loader.c:126
msgid ""
-"Debian-Installer Loader will be setup with the following parameters. Do NOT "
-"change any of these unless you know what you're doing."
+"The following parameters will be used. Do NOT change any of these unless "
+"you know what you're doing."
msgstr ""
-#: win32-loader.c:124
+#: win32-loader.c:127
msgid "Proxy settings (host:port):"
msgstr ""
-#: win32-loader.c:125
+#: win32-loader.c:128
msgid "Location of boot.ini:"
msgstr ""
-#: win32-loader.c:126
+#: win32-loader.c:129
msgid "Base URL for netboot images (linux and initrd.gz):"
msgstr ""
-#: win32-loader.c:127
+#: win32-loader.c:130
msgid "Error"
msgstr ""
-#: win32-loader.c:128
+#: win32-loader.c:131
msgid "Error: failed to copy $0 to $1."
msgstr ""
-#: win32-loader.c:129
+#: win32-loader.c:132
msgid "Generating $0"
msgstr ""
-#: win32-loader.c:130
+#: win32-loader.c:133
msgid "Appending preseeding information to $0"
msgstr ""
-#: win32-loader.c:131
+#: win32-loader.c:134
msgid "Error: unable to run $0."
msgstr ""
-#: win32-loader.c:132
+#: win32-loader.c:135
msgid "Disabling NTFS compression in bootstrap files"
msgstr ""
-#: win32-loader.c:133
-msgid "Registering Debian-Installer in NTLDR"
+#: win32-loader.c:136
+msgid "Registering in NTLDR"
msgstr ""
-#: win32-loader.c:134
-msgid "Registering Debian-Installer in BootMgr"
+#: win32-loader.c:137
+msgid "Registering in BootMgr"
msgstr ""
-#: win32-loader.c:135
+#: win32-loader.c:138
msgid "Error: failed to parse bcdedit.exe output."
msgstr ""
-#: win32-loader.c:136
+#: win32-loader.c:139
msgid "Error: $0 not found. Is this really Windows $windows_version?"
msgstr ""
-#: win32-loader.c:137
+#: win32-loader.c:140
msgid "VERY IMPORTANT NOTICE:\\n\\n"
msgstr ""
@@ -324,33 +336,31 @@
#. Take into account that either option has to make sense in our
#. current context (i.e. be careful when using pronouns, etc).
#.
-#: win32-loader.c:145
+#: win32-loader.c:148
msgid ""
"The second stage of this install process will now be started. After your "
"confirmation, this program will restart Windows in DOS mode, and "
-"automaticaly load Debian Installer.\\n\\n"
+"automatically load the next part of the install process.\\n\\n"
msgstr ""
-#: win32-loader.c:146
+#: win32-loader.c:149
msgid ""
-"You need to reboot in order to proceed with your Debian install. During "
+"You need to reboot in order to proceed with the install process. During "
"your next boot, you will be asked whether you want to start Windows or "
-"Debian Installer. Choose Debian Installer to continue with the install "
-"process.\\n\\n"
+"continue with the install process.\\n\\n"
msgstr ""
-#: win32-loader.c:147
+#: win32-loader.c:150
msgid ""
"During the install process, you will be offered the possibility of either "
-"reducing your Windows partition to install Debian or completely replacing "
-"it. In both cases, it is STRONGLY RECOMMENDED that you have previously made "
-"a backup of your data. Nor the authors of this loader neither the Debian "
-"project will take ANY RESPONSIBILITY in the event of data loss.\\n\\nOnce "
-"your Debian install is complete (and if you have chosen to keep Windows in "
-"your disk), you can uninstall the Debian-Installer Loader through the "
-"Windows Add/Remove Programs dialog in Control Panel."
+"reducing your Windows partition or completely replacing it. In both cases, "
+"it is STRONGLY RECOMMENDED that you have previously made a backup of your "
+"data. The authors of this software will NOT take ANY RESPONSIBILITY in the "
+"event of data loss.\\n\\nOnce your install is complete (and if you have "
+"chosen to keep Windows in your disk), you can uninstall this loader through "
+"the Windows Add/Remove Programs dialog in Control Panel."
msgstr ""
-#: win32-loader.c:148
+#: win32-loader.c:151
msgid "Do you want to reboot now?"
msgstr ""
diff -Nru win32-loader-0.6.10/l10n/po/ml.po win32-loader-0.6.18/l10n/po/ml.po
diff -Nru win32-loader-0.6.10/l10n/po/nb.po win32-loader-0.6.18/l10n/po/nb.po
diff -Nru win32-loader-0.6.10/l10n/po/nl.po win32-loader-0.6.18/l10n/po/nl.po
diff -Nru win32-loader-0.6.10/l10n/po/pl.po win32-loader-0.6.18/l10n/po/pl.po
diff -Nru win32-loader-0.6.10/l10n/po/pt_BR.po win32-loader-0.6.18/l10n/po/pt_BR.po
diff -Nru win32-loader-0.6.10/l10n/po/pt.po win32-loader-0.6.18/l10n/po/pt.po
diff -Nru win32-loader-0.6.10/l10n/po/ro.po win32-loader-0.6.18/l10n/po/ro.po
diff -Nru win32-loader-0.6.10/l10n/po/ru.po win32-loader-0.6.18/l10n/po/ru.po
diff -Nru win32-loader-0.6.10/l10n/po/sk.po win32-loader-0.6.18/l10n/po/sk.po
diff -Nru win32-loader-0.6.10/l10n/po/sl.po win32-loader-0.6.18/l10n/po/sl.po
diff -Nru win32-loader-0.6.10/l10n/po/sq.po win32-loader-0.6.18/l10n/po/sq.po
diff -Nru win32-loader-0.6.10/l10n/po/sv.po win32-loader-0.6.18/l10n/po/sv.po
diff -Nru win32-loader-0.6.10/l10n/po/ta.po win32-loader-0.6.18/l10n/po/ta.po
diff -Nru win32-loader-0.6.10/l10n/po/th.po win32-loader-0.6.18/l10n/po/th.po
diff -Nru win32-loader-0.6.10/l10n/po/tr.po win32-loader-0.6.18/l10n/po/tr.po
diff -Nru win32-loader-0.6.10/l10n/po/uk.po win32-loader-0.6.18/l10n/po/uk.po
diff -Nru win32-loader-0.6.10/l10n/po/vi.po win32-loader-0.6.18/l10n/po/vi.po
diff -Nru win32-loader-0.6.10/l10n/po/zh_CN.po win32-loader-0.6.18/l10n/po/zh_CN.po
diff -Nru win32-loader-0.6.10/l10n/po/zh_TW.po win32-loader-0.6.18/l10n/po/zh_TW.po
diff -Nru win32-loader-0.6.10/l10n/win32-loader.c win32-loader-0.6.18/l10n/win32-loader.c
--- win32-loader-0.6.10/l10n/win32-loader.c 2009-01-03 23:09:29.000000000 +0100
+++ win32-loader-0.6.18/l10n/win32-loader.c 2010-05-05 18:04:28.000000000 +0200
@@ -68,16 +68,16 @@
printf ("LoadLanguageFile \"${NSISDIR}\\Contrib\\Language files\\%s\"\n", _("English.nlf"));
printf ("LicenseLangString license ${%s} license\n", nsis_lang);
- langstring ("program_name", _("Debian-Installer Loader"));
+ langstring ("program_name", _("Installer Loader"));
langstring ("error_missing_ini", _("Cannot find win32-loader.ini."));
langstring ("error_incomplete_ini", _("win32-loader.ini is incomplete. Contact the provider of this medium."));
langstring ("detected_keyboard_is", _("This program has detected that your keyboard type is \"$0\". Is this correct?"));
langstring ("keyboard_bug_report", _("Please send a bug report with the following information:\n\n - Version of Windows.\n - Country settings.\n - Real keyboard type.\n - Detected keyboard type.\n\nThank you."));
- langstring ("not_enough_space_for_debian", _("There doesn't seem to be enough free disk space in drive $c. For a complete desktop install, it is recommended to have at least 3 GB. If there is already a separate disk or partition to install Debian, or if you plan to replace Windows completely, you can safely ignore this warning."));
+ langstring ("not_enough_space_for_debian", _("There doesn't seem to be enough free disk space in drive $c. For a complete desktop install, it is recommended to have at least 3 GB. If there is already a separate disk or partition for this install, or if you plan to replace Windows completely, you can safely ignore this warning."));
langstring ("not_enough_space_for_loader", _("Error: not enough free disk space. Aborting install."));
langstring ("unsupported_version_of_windows", _("This program doesn't support Windows $windows_version yet."));
- langstring ("amd64_on_i386", _("The version of Debian you're trying to install is designed to run on modern, 64-bit computers. However, your computer is incapable of running 64-bit programs.\n\nUse the 32-bit (\"i386\") version of Debian, or the Multi-arch version which is able to install either of them.\n\nThis installer will abort now."));
- langstring ("i386_on_amd64", _("Your computer is capable of running modern, 64-bit operating systems. However, the version of Debian you're trying to install is designed to run on older, 32-bit hardware.\n\nYou may still proceed with this install, but in order to take the most advantage of your computer, we recommend that you use the 64-bit (\"amd64\") version of Debian instead, or the Multi-arch version which is able to install either of them.\n\nWould you like to abort now?"));
+ langstring ("amd64_on_i386", _("The system version you're trying to install is designed to run on modern, 64-bit computers. However, your computer is incapable of running 64-bit programs.\n\nUse the 32-bit (\"i386\") version, or the Multi-arch version which is able to install either of them.\n\nThis installer will abort now."));
+ langstring ("i386_on_amd64", _("Your computer is capable of running modern, 64-bit operating systems. However, the system version you're trying to install is designed to run on older, 32-bit hardware.\n\nYou may still proceed with this install, but in order to take the most advantage of your computer, we recommend that you use the 64-bit (\"amd64\") version instead, or the Multi-arch version which is able to install either of them.\n\nWould you like to abort now?"));
/*
translate:
"system partition" and "boot partition" are defined by Microsoft to mean the opposite of what a
@@ -90,8 +90,11 @@
langstring ("expert2", _("Normal mode. Recommended for most users."));
langstring ("expert3", _("Expert mode. Recommended for expert users who want full control of the install process."));
langstring ("rescue1", _("Select action:"));
- langstring ("rescue2", _("Install Debian GNU/Linux on this computer."));
- langstring ("rescue3", _("Repair an existing Debian system (rescue mode)."));
+ langstring ("rescue2", _("Begin install on this computer."));
+ langstring ("rescue3", _("Repair an installed system (rescue mode)."));
+ langstring ("kernel1", _("Select the kernel:"));
+ langstring ("kernel2", _("GNU/Linux"));
+ langstring ("kernel3", _("GNU/kFreeBSD"));
langstring ("graphics1", _("Select install mode:"));
langstring ("graphics2", _("Graphical install"));
langstring ("graphics3", _("Text install"));
@@ -120,7 +123,7 @@
langstring ("di_branch4", _("It is recommended that you check for known issues before using a daily build. Would you like to do that now?"));
langstring ("desktop1", _("Desktop environment:"));
langstring ("desktop2", _("None"));
- langstring ("custom1", _("Debian-Installer Loader will be setup with the following parameters. Do NOT change any of these unless you know what you're doing."));
+ langstring ("custom1", _("The following parameters will be used. Do NOT change any of these unless you know what you're doing."));
langstring ("custom2", _("Proxy settings (host:port):"));
langstring ("custom3", _("Location of boot.ini:"));
langstring ("custom5", _("Base URL for netboot images (linux and initrd.gz):"));
@@ -130,8 +133,8 @@
langstring ("appending_preseeding", _("Appending preseeding information to $0"));
langstring ("error_exec", _("Error: unable to run $0."));
langstring ("disabling_ntfs_compression", _("Disabling NTFS compression in bootstrap files"));
- langstring ("registering_ntldr", _("Registering Debian-Installer in NTLDR"));
- langstring ("registering_bootmgr", _("Registering Debian-Installer in BootMgr"));
+ langstring ("registering_ntldr", _("Registering in NTLDR"));
+ langstring ("registering_bootmgr", _("Registering in BootMgr"));
langstring ("error_bcdedit_extract_id", _("Error: failed to parse bcdedit.exe output."));
langstring ("system_file_not_found", _("Error: $0 not found. Is this really Windows $windows_version?"));
langstring ("warning1", _("VERY IMPORTANT NOTICE:\\n\\n"));
@@ -142,9 +145,9 @@
Take into account that either option has to make sense in our
current context (i.e. be careful when using pronouns, etc).
*/
- langstring ("warning2_direct", _("The second stage of this install process will now be started. After your confirmation, this program will restart Windows in DOS mode, and automaticaly load Debian Installer.\\n\\n"));
- langstring ("warning2_reboot", _("You need to reboot in order to proceed with your Debian install. During your next boot, you will be asked whether you want to start Windows or Debian Installer. Choose Debian Installer to continue with the install process.\\n\\n"));
- langstring ("warning3", _("During the install process, you will be offered the possibility of either reducing your Windows partition to install Debian or completely replacing it. In both cases, it is STRONGLY RECOMMENDED that you have previously made a backup of your data. Nor the authors of this loader neither the Debian project will take ANY RESPONSIBILITY in the event of data loss.\\n\\nOnce your Debian install is complete (and if you have chosen to keep Windows in your disk), you can uninstall the Debian-Installer Loader through the Windows Add/Remove Programs dialog in Control Panel."));
+ langstring ("warning2_direct", _("The second stage of this install process will now be started. After your confirmation, this program will restart Windows in DOS mode, and automatically load the next part of the install process.\\n\\n"));
+ langstring ("warning2_reboot", _("You need to reboot in order to proceed with the install process. During your next boot, you will be asked whether you want to start Windows or continue with the install process.\\n\\n"));
+ langstring ("warning3", _("During the install process, you will be offered the possibility of either reducing your Windows partition or completely replacing it. In both cases, it is STRONGLY RECOMMENDED that you have previously made a backup of your data. The authors of this software will NOT take ANY RESPONSIBILITY in the event of data loss.\\n\\nOnce your install is complete (and if you have chosen to keep Windows in your disk), you can uninstall this loader through the Windows Add/Remove Programs dialog in Control Panel."));
langstring ("reboot_now", _("Do you want to reboot now?"));
return 0;
diff -Nru win32-loader-0.6.10/l10n/win32-loader.sh win32-loader-0.6.18/l10n/win32-loader.sh
--- win32-loader-0.6.10/l10n/win32-loader.sh 2008-09-07 00:17:16.000000000 +0200
+++ win32-loader-0.6.18/l10n/win32-loader.sh 2010-04-28 14:29:40.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/bash -e
#
# l10n support for win32-loader
-# Copyright (C) 2007 Robert Millan <rmh@aybabtu.com>
+# Copyright (C) 2007,2009 Robert Millan <rmh@aybabtu.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@
# IMPORTANT: only the subset of UTF-8 that can be converted to NTLDR charset
# (e.g. cp437) should be used in this string. If you don't know which charset
# applies, limit yourself to ascii.
-d_i=`gettext "Debian Installer"`
+d_i=`gettext "Continue with install process"`
# - Then we get a sample for bootmgr in the native charset.
echo "${d_i}" | iconv -f utf-8 -t "${charset}" | langstring d-i
@@ -88,5 +88,5 @@
(if echo "${d_i}" | iconv -f utf-8 -t "${ntldr_charset}" > /dev/null 2>&1 ; then
echo "${d_i}" | iconv -f utf-8 -t "${ntldr_charset}"
else
- echo "Debian Installer"
+ echo "Continue with install process"
fi) | langstring d-i_ntldr
diff -Nru win32-loader-0.6.10/license.in win32-loader-0.6.18/license.in
--- win32-loader-0.6.10/license.in 2009-01-03 22:59:26.000000000 +0100
+++ win32-loader-0.6.18/license.in 2010-04-28 14:29:40.000000000 +0200
@@ -1,5 +1,7 @@
-Debian-Installer Loader @VERSION@
-Copyright (C) 2007,2008,2009 Robert Millan
+Win32-loader @VERSION@
+
+Copyright (C) 2007,2008,2009 Robert Millan
+Copyright (C) 2010 Didier Raboud
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
diff -Nru win32-loader-0.6.10/main.nsi win32-loader-0.6.18/main.nsi
--- win32-loader-0.6.10/main.nsi 2009-01-18 13:01:49.000000000 +0100
+++ win32-loader-0.6.18/main.nsi 2010-05-05 18:15:02.000000000 +0200
@@ -1,5 +1,6 @@
; Debian-Installer Loader
; Copyright (C) 2007,2008,2009 Robert Millan <rmh@aybabtu.com>
+; Copyright (C) 2010 Didier Raboud <didier@raboud.com>
;
; This program is free software: you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@@ -32,12 +33,12 @@
!include LogicLib.nsh
!include FileFunc.nsh
!include WinMessages.nsh
+!include WinVer.nsh
!insertmacro GetRoot
!addplugindir plugins
!addplugindir plugins/cpuid
!addplugindir plugins/systeminfo
-!include getwindowsversion.nsh
;--------------------------------
@@ -50,8 +51,9 @@
Page license
Page custom ShowExpert
Page custom ShowRescue
+Page custom ShowKernel
Page custom ShowGraphics
-!ifdef NETWORK_BASE_URL
+!ifdef NOCD
Page custom ShowBranch
!endif
Page custom ShowDesktop
@@ -122,7 +124,7 @@
; ********************************************** Initialise $preseed_cmdline
StrCpy $preseed_cmdline " "
-!ifndef NETWORK_BASE_URL
+!ifndef NOCD
; ********************************************** Initialise $d
${GetRoot} $EXEDIR $d
@@ -151,7 +153,7 @@
; ********************************************** Initialise $arch
test64::get_arch
StrCpy $arch $0
-!ifndef NETWORK_BASE_URL
+!ifndef NOCD
ReadINIStr $0 $d\win32-loader.ini "installer" "arch"
${If} "$0:$arch" == "amd64:i386"
MessageBox MB_OK|MB_ICONSTOP $(amd64_on_i386)
@@ -165,27 +167,23 @@
!endif
; Windows version is another abort condition
- Var /GLOBAL windows_version
Var /GLOBAL windows_boot_method
- Call GetWindowsVersion
- Pop $windows_version
- StrCpy $1 $windows_version 3
- ${If} $1 == "NT "
+ ${If} ${IsNT}
StrCpy $windows_boot_method ntldr
Goto windows_version_ok
${Endif}
- ${If} $windows_version == "95"
- ${OrIf} $windows_version == "98"
+ ${If} ${AtMostWinME}
StrCpy $windows_boot_method direct
Goto windows_version_ok
${Endif}
- ${If} $windows_version == "2000"
- ${OrIf} $windows_version == "XP"
- ${OrIf} $windows_version == "2003"
+ ${If} ${AtMostWin2003}
StrCpy $windows_boot_method ntldr
Goto windows_version_ok
${Endif}
- ${If} $windows_version == "Vista"
+ ${If} ${AtMostWinVista}
+; In the default install, "system partition" is not mounted. We need a way
+; around this before Windows 7 can be enabled.
+; ${OrIf} ${IsWin7}
StrCpy $windows_boot_method bootmgr
Goto windows_version_ok
${Endif}
@@ -215,7 +213,7 @@
; For the uninstaller
WriteRegStr HKLM "Software\Debian\Debian-Installer Loader" "system_drive" "$c"
- StrCpy $INSTDIR "$c\debian"
+ StrCpy $INSTDIR "$c\win32-loader"
SetOutPath $INSTDIR
File /oname=$PLUGINSDIR\expert.ini templates/binary_choice.ini
@@ -231,9 +229,6 @@
${Else}
StrCpy $expert false
${Endif}
-
- Var /GLOBAL debian_release
- StrCpy $debian_release lenny
FunctionEnd
Function ShowRescue
@@ -251,17 +246,45 @@
${Endif}
FunctionEnd
+Function ShowKernel
+ Var /GLOBAL kernel
+!ifdef NOCD
+ ${If} $expert == true
+ ${AndIf} $windows_boot_method != direct ; loadlin can only load linux
+ File /oname=$PLUGINSDIR\kernel.ini templates/binary_choice.ini
+ WriteINIStr $PLUGINSDIR\kernel.ini "Field 1" "Text" $(kernel1)
+ WriteINIStr $PLUGINSDIR\kernel.ini "Field 2" "Text" $(kernel2)
+ WriteINIStr $PLUGINSDIR\kernel.ini "Field 3" "Text" $(kernel3)
+ InstallOptions::dialog $PLUGINSDIR\kernel.ini
+
+ ReadINIStr $0 $PLUGINSDIR\kernel.ini "Field 3" "State"
+ ${If} $0 == "1"
+ StrCpy $kernel kfreebsd
+ ${Else}
+ StrCpy $kernel linux
+ ${Endif}
+ ${Else}
+ ; ** Default to GNU/Linux
+ StrCpy $kernel linux
+ ${Endif}
+!else
+ ; TODO: detect the CD architecture
+ StrCpy $kernel linux
+!endif
+FunctionEnd
+
Function ShowGraphics
Var /GLOBAL user_interface
Var /GLOBAL gtk
-!ifndef NETWORK_BASE_URL
+!ifndef NOCD
Var /GLOBAL predefined_user_interface
ReadINIStr $predefined_user_interface $d\win32-loader.ini "installer" "user_interface"
${If} $predefined_user_interface == ""
!endif
${If} $expert == true
+ ${AndIf} $kernel == "linux"
File /oname=$PLUGINSDIR\graphics.ini templates/graphics.ini
File /oname=$PLUGINSDIR\gtk.bmp templates/gtk.bmp
File /oname=$PLUGINSDIR\text.bmp templates/text.bmp
@@ -275,10 +298,11 @@
${If} $0 == "1"
StrCpy $user_interface graphical
${EndIf}
- ${Else}
- StrCpy $user_interface graphical
+ ${ElseIf} $kernel == linux
+ ; ** Default to graphical interface for linux
+ StrCpy $user_interface graphical
${Endif}
-!ifndef NETWORK_BASE_URL
+!ifndef NOCD
${Else}
StrCpy $user_interface $predefined_user_interface
${Endif}
@@ -296,7 +320,7 @@
${EndIf}
FunctionEnd
-!ifdef NETWORK_BASE_URL
+!ifdef NOCD
Function Download
; Base URL
@@ -330,7 +354,6 @@
Function ShowBranch
Var /GLOBAL di_branch
StrCpy $di_branch stable
- StrCpy $debian_release etch
File /oname=$PLUGINSDIR\di_branch.ini templates/binary_choice.ini
${If} $expert == true
WriteINIStr $PLUGINSDIR\di_branch.ini "Field 1" "Text" $(di_branch1)
@@ -340,7 +363,6 @@
ReadINIStr $0 $PLUGINSDIR\di_branch.ini "Field 3" "State"
${If} $0 == "1"
StrCpy $di_branch daily
- StrCpy $debian_release lenny
${Endif}
${Endif}
@@ -350,15 +372,25 @@
${If} $di_branch == "daily"
MessageBox MB_YESNO|MB_ICONQUESTION $(di_branch4) IDNO +2
ExecShell "open" "http://wiki.debian.org/DebianInstaller/Today";
- Var /GLOBAL hacker
- ${If} $arch == "amd64"
- StrCpy $hacker aba
- ${Else}
- StrCpy $hacker joeyh
- ${Endif}
- StrCpy $base_url "http://people.debian.org/~$hacker/d-i/images/daily/netboot/$gtkdebian-installer/$arch";
+
+ ; Daily images URL
+ ; See http://svn.debian.org/viewsvn/d-i/trunk/scripts/daily-build-aggregator for the canonical list
+ ${If} $kernel == "linux"
+ ${If} $arch == "i386"
+ StrCpy $base_url "http://people.debian.org/~joeyh/d-i/images/daily/netboot/$gtkdebian-installer/$arch";
+ ${Else} ; We have only two arches, then Else means $arch == "amd64"
+ StrCpy $base_url "http://d-i.debian.org/daily-images/$arch/daily/netboot/$gtkdebian-installer/$arch";
+ ${Endif}
+ ${ElseIf} $kernel == "kfreebsd"
+ StrCpy $base_url "http://d-i.debian.org/daily-images/kfreebsd-$arch/daily/monolithic";
+ ${EndIf}
${Else}
- StrCpy $base_url "http://ftp.se.debian.org/debian/dists/stable/main/installer-$arch/current/images/netboot/$gtkdebian-installer/$arch";
+ ${If} $kernel == "linux"
+ StrCpy $base_url "http://ftp.se.debian.org/debian/dists/stable/main/installer-$arch/current/images/netboot/$gtkdebian-installer/$arch";
+ ${ElseIf} $kernel == "kfreebsd"
+ # TODO: CHECK THIS (no stable image so far)
+ StrCpy $base_url "http://ftp.se.debian.org/debian/dists/stable/main/installer-kfreebsd-$arch/current/images/netboot/$gtkdebian-installer/kfreebsd-$arch";
+ ${EndIf}
${Endif}
FunctionEnd
!endif
@@ -406,44 +438,37 @@
${Endif}
; Add the results to our preseed file
- ${If} $debian_release == "etch"
- ${If} $_desktop == "gnome"
- ; GNOME is already default, do nothing (on etch, preseeding this
- ; information makes the tasksel dialog go away, so don't do it
- ; gratuitously!)
- Return
- ${Endif}
- StrCpy $preseed_cfg "\
-$preseed_cfg$\n\
-tasksel tasksel/first multiselect $_desktop-desktop, standard$\n\
-tasksel tasksel/first seen false"
- ${Else}
- StrCpy $preseed_cfg "\
+ StrCpy $preseed_cfg "\
$preseed_cfg$\n\
tasksel tasksel/desktop multiselect $_desktop-desktop$\n\
tasksel tasksel/desktop seen false"
- ${Endif}
FunctionEnd
Function ShowCustom
; Gather all the missing information before ShowCustom is displayed
-!ifndef NETWORK_BASE_URL
+!ifndef NOCD
; ********************************************** Media-based install
- Var /GLOBAL linux
- Var /GLOBAL initrd
- Var /GLOBAL g2ldr
- Var /GLOBAL g2ldr_mbr
- ReadINIStr $linux $d\win32-loader.ini "installer" "$arch/$gtklinux"
- ReadINIStr $initrd $d\win32-loader.ini "installer" "$arch/$gtkinitrd"
- ReadINIStr $g2ldr $d\win32-loader.ini "grub" "g2ldr"
- ReadINIStr $g2ldr_mbr $d\win32-loader.ini "grub" "g2ldr.mbr"
- StrCmp $linux "" incomplete_ini
- StrCmp $initrd "" incomplete_ini
- StrCmp $g2ldr "" incomplete_ini
- StrCmp $g2ldr_mbr "" incomplete_ini
- Goto ini_is_ok
+ ${If} $kernel == "linux"
+ Var /GLOBAL linux
+ Var /GLOBAL initrd
+ Var /GLOBAL g2ldr
+ Var /GLOBAL g2ldr_mbr
+ ReadINIStr $linux $d\win32-loader.ini "installer" "$arch/$gtklinux"
+ ReadINIStr $initrd $d\win32-loader.ini "installer" "$arch/$gtkinitrd"
+ ReadINIStr $g2ldr $d\win32-loader.ini "grub" "g2ldr"
+ ReadINIStr $g2ldr_mbr $d\win32-loader.ini "grub" "g2ldr.mbr"
+ StrCmp $linux "" incomplete_ini
+ StrCmp $initrd "" incomplete_ini
+ StrCmp $g2ldr "" incomplete_ini
+ StrCmp $g2ldr_mbr "" incomplete_ini
+ Goto ini_is_ok
+ ${ElseIf} $kernel == "kfreebsd"
+ # TODO: Check if kfreebsd will ever ship a media-based installed.
+ # If so, make sure it works here.
+ Goto incomplete_ini
+ ${EndIf}
incomplete_ini:
MessageBox MB_OK|MB_ICONSTOP "$(error_incomplete_ini)"
Quit
@@ -588,13 +613,13 @@
WriteINIStr $PLUGINSDIR\custom.ini "Field 4" "Text" "Linux cmdline:"
WriteINIStr $PLUGINSDIR\custom.ini "Field 5" "Text" $(custom5)
WriteINIStr $PLUGINSDIR\custom.ini "Field 6" "State" "$proxy"
-!ifdef NETWORK_BASE_URL
+!ifdef NOCD
WriteINIStr $PLUGINSDIR\custom.ini "Field 8" "State" "$base_url"
!endif
WriteINIStr $PLUGINSDIR\custom.ini "Field 9" "State" "$preseed_cmdline"
InstallOptions::dialog $PLUGINSDIR\custom.ini
ReadINIStr $proxy $PLUGINSDIR\custom.ini "Field 6" "State"
-!ifdef NETWORK_BASE_URL
+!ifdef NOCD
ReadINIStr $base_url $PLUGINSDIR\custom.ini "Field 8" "State"
!endif
ReadINIStr $preseed_cmdline $PLUGINSDIR\custom.ini "Field 9" "State"
@@ -614,7 +639,7 @@
${Endif}
FunctionEnd
-Section "Debian-Installer Loader"
+Section "Installer Loader"
; ******************************************************************************
; ***************************************** THIS IS WHERE THE REAL ACTION STARTS
@@ -627,31 +652,51 @@
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader" "DisplayName" $(program_name)
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader" "UninstallString" "$INSTDIR\uninstall.exe"
-!ifndef NETWORK_BASE_URL
- ClearErrors
- StrCpy $0 "$EXEDIR\$linux"
- StrCpy $1 "$INSTDIR\linux"
- CopyFiles /FILESONLY "$0" "$1"
- IfErrors 0 +3
- MessageBox MB_OK|MB_ICONSTOP "$(error_copyfiles)"
- Quit
- StrCpy $0 "$EXEDIR\$initrd"
- StrCpy $1 "$INSTDIR\initrd.gz"
- CopyFiles /FILESONLY "$0" "$1"
- IfErrors 0 +3
+!ifndef NOCD
+ ${If} $kernel == "linux"
+ ClearErrors
+ StrCpy $0 "$EXEDIR\$linux"
+ StrCpy $1 "$INSTDIR\linux"
+ CopyFiles /FILESONLY "$0" "$1"
+ IfErrors 0 +3
+ MessageBox MB_OK|MB_ICONSTOP "$(error_copyfiles)"
+ Quit
+ StrCpy $0 "$EXEDIR\$initrd"
+ StrCpy $1 "$INSTDIR\initrd.gz"
+ CopyFiles /FILESONLY "$0" "$1"
+ IfErrors 0 +3
+ MessageBox MB_OK|MB_ICONSTOP "$(error_copyfiles)"
+ Quit
+ ${ElseIf} $kernel == "kfreebsd"
+ # TODO: Check if kfreebsd will ever ship a media-based installed.
+ # If so, make sure it works here.
MessageBox MB_OK|MB_ICONSTOP "$(error_copyfiles)"
Quit
+ ${EndIf}
!else
- Push "false"
- Push "linux"
- Push "$INSTDIR"
- Push "$base_url"
- Call Download
- Push "false"
- Push "initrd.gz"
- Push "$INSTDIR"
- Push "$base_url"
- Call Download
+ ${If} $kernel == "linux"
+ Push "false"
+ Push "linux"
+ Push "$INSTDIR"
+ Push "$base_url"
+ Call Download
+ Push "false"
+ Push "initrd.gz"
+ Push "$INSTDIR"
+ Push "$base_url"
+ Call Download
+ ${ElseIf} $kernel == "kfreebsd"
+ Push "false"
+ Push "kfreebsd.gz"
+ Push "$INSTDIR"
+ Push "$base_url"
+ Call Download
+ Push "false"
+ Push "initrd.gz"
+ Push "$INSTDIR"
+ Push "$base_url"
+ Call Download
+ ${EndIf}
!endif
; We're about to write down our preseed line. This would be a nice place
@@ -664,13 +709,23 @@
${Endif}
; ********************************************** grub.cfg
- StrCpy $0 "$c\grub.cfg"
+ StrCpy $0 "$c\win32-loader\grub.cfg"
DetailPrint "$(generating)"
- FileOpen $0 $c\grub.cfg w
- FileWrite $0 "\
-linux /debian/linux $preseed_cmdline$\n\
-initrd /debian/initrd.gz$\n\
+ FileOpen $0 $c\win32-loader\grub.cfg w
+ ${If} $kernel == "linux"
+ FileWrite $0 "\
+linux /win32-loader/linux $preseed_cmdline$\n\
+initrd /win32-loader/initrd.gz$\n\
+boot$\n"
+ ${ElseIf} $kernel == "kfreebsd"
+ FileWrite $0 "\
+kfreebsd /win32-loader/kfreebsd.gz$\n\
+kfreebsd_module /win32-loader/initrd.gz type=mfs_root$\n\
+set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0$\n\
+set kFreeBSD.hw.ata.ata_dma=0 # needed for qemu hard disk # TODO: delete$\n\
+set kFreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1$\n\
boot$\n"
+ ${EndIf}
FileClose $0
; ********************************************** cpio hack
@@ -700,7 +755,8 @@
gzip.exe -1 < newc_chunk >> initrd.gz$\r$\n\
"
FileClose $0
-
+; TODO: FIX THIS FOR kFreeBSD
+${If} $kernel == "linux"
nsExec::Exec '"$INSTDIR\cpio.bat"'
Pop $0
${If} $0 != 0
@@ -708,20 +764,26 @@
MessageBox MB_OK|MB_ICONSTOP "$(error_exec)"
Quit
${Endif}
+${EndIf}
; ********************************************** Do bootloader last, because it's the most dangerous
${If} $windows_boot_method == ntldr
-!ifdef NETWORK_BASE_URL
- Push "false"
- Push "g2ldr"
- Push "$c"
- Push "${NETWORK_BASE_URL}"
- Call Download
- Push "false"
- Push "g2ldr.mbr"
- Push "$c"
- Push "${NETWORK_BASE_URL}"
- Call Download
+!ifdef NOCD
+ !ifdef NETWORK_BASE_URL
+ Push "false"
+ Push "g2ldr"
+ Push "$c"
+ Push "${NETWORK_BASE_URL}"
+ Call Download
+ Push "false"
+ Push "g2ldr.mbr"
+ Push "$c"
+ Push "${NETWORK_BASE_URL}"
+ Call Download
+ !else
+ File /oname=$c\g2ldr g2ldr
+ File /oname=$c\g2ldr.mbr g2ldr.mbr
+ !endif
!else
ClearErrors
StrCpy $0 "$EXEDIR\$g2ldr"
@@ -740,9 +802,16 @@
DetailPrint "$(registering_ntldr)"
SetFileAttributes "$c\boot.ini" NORMAL
SetFileAttributes "$c\boot.ini" SYSTEM|HIDDEN
+
; Sometimes timeout isn't set. This may result in ntldr booting straight to
; Windows (bad) or straight to Debian-Installer (also bad)! Force it to 30
- ; just in case.
+ ; just in case. Store its eventual old value alongside
+ ; Read the already defined timeout
+ ReadIniStr $0 "$c\boot.ini" "boot loader" "timeout"
+ IfErrors 0 no_boot_ini_timeout
+ ClearErrors
+ WriteIniStr "$c\boot.ini" "boot loader" "old_timeout_win32-loader" $0
+ no_boot_ini_timeout:
WriteIniStr "$c\boot.ini" "boot loader" "timeout" "30"
WriteIniStr "$c\boot.ini" "operating systems" "$c\g2ldr.mbr" '"$(d-i_ntldr)"'
${Endif}
@@ -753,17 +822,22 @@
${Endif}
${If} $windows_boot_method == bootmgr
-!ifdef NETWORK_BASE_URL
- Push "false"
- Push "g2ldr"
- Push "$c"
- Push "${NETWORK_BASE_URL}"
- Call Download
- Push "false"
- Push "g2ldr.mbr"
- Push "$c"
- Push "${NETWORK_BASE_URL}"
- Call Download
+!ifdef NOCD
+ !ifdef NETWORK_BASE_URL
+ Push "false"
+ Push "g2ldr"
+ Push "$c"
+ Push "${NETWORK_BASE_URL}"
+ Call Download
+ Push "false"
+ Push "g2ldr.mbr"
+ Push "$c"
+ Push "${NETWORK_BASE_URL}"
+ Call Download
+ !else
+ File /oname=$c\g2ldr g2ldr
+ File /oname=$c\g2ldr.mbr g2ldr.mbr
+ !endif
!else
ClearErrors
StrCpy $0 "$EXEDIR\$g2ldr"
@@ -813,8 +887,13 @@
; ********************************************** Needed for systems with compressed NTFS
DetailPrint "$(disabling_ntfs_compression)"
- nsExec::Exec '"compact" /u $c\g2ldr $c\g2ldr.mbr $c\grub.cfg $INSTDIR\linux $INSTDIR\initrd.gz'
+ nsExec::Exec '"compact" /u $c\g2ldr $c\g2ldr.mbr $c\grub.cfg'
; in my tests, uncompressing $c\grub.cfg wasn't necessary, but better be safe than sorry
+ ${If} $kernel == "linux"
+ nsExec::Exec '"compact" /u $INSTDIR\linux $INSTDIR\initrd.gz'
+ ${ElseIf} $kernel == "kfreebsd"
+ nsExec::Exec '"compact" /u $INSTDIR\kfreebsd.gz $INSTDIR\initrd.gz'
+ ${EndIf}
SectionEnd
@@ -845,6 +924,14 @@
SetFileAttributes "$c\boot.ini" NORMAL
SetFileAttributes "$c\boot.ini" SYSTEM|HIDDEN
DeleteINIStr "$c\boot.ini" "operating systems" "$c\g2ldr.mbr"
+
+ ReadIniStr $0 "$c\boot.ini" "boot loader" "old_timeout_win32-loader"
+ IfErrors 0 no_saved_boot_ini_timeout
+ ; Restore original timeout
+ ClearErrors
+ WriteIniStr "$c\boot.ini" "boot loader" "timeout" $0
+ DeleteINIStr "$c\boot.ini" "boot loader" "old_timeout_win32-loader"
+ no_saved_boot_ini_timeout:
ReadRegStr $0 HKLM "Software\Debian\Debian-Installer Loader" "bootmgr"
${If} $0 != ""
diff -Nru win32-loader-0.6.10/Makefile win32-loader-0.6.18/Makefile
--- win32-loader-0.6.10/Makefile 2008-10-30 16:14:40.000000000 +0100
+++ win32-loader-0.6.18/Makefile 2010-08-01 15:51:04.000000000 +0200
@@ -4,35 +4,47 @@
PACKAGE := win32-loader
VERSION := $(shell head -n 1 debian/changelog | sed -e "s/^$(PACKAGE) (\(.*\)).*/\1/g")
-CC := i586-mingw32msvc-gcc -Os
-STRIP := i586-mingw32msvc-strip
-CFLAGS := -Wl,--file-alignment,512 -Werror
+NSIS_CC := i586-mingw32msvc-gcc -Os
+NSIS_STRIP := i586-mingw32msvc-strip
+NSIS_CFLAGS := -Wl,--file-alignment,512 -Werror -D_WIN32_WINNT=0x0500
+
+ifeq ($(wildcard /usr/i586-mingw32msvc/include/exdll.h), /usr/i586-mingw32msvc/include/exdll.h)
+NSIS_CFLAGS += -DHAVE_EXDLL_H
+else
+NSIS_CFLAGS += -L/usr/i586-mingw32msvc/lib/nsis -lpluginapi
+endif
+
+MAKENSIS := makensis -V3
+# Standalone version : Not linked to a website with preseed.cfg
+ifdef STANDALONE
+MAKENSIS += -DNOCD=yes
+endif
-MAKENSIS := makensis
+# Network version : Linked to a website with preseed.cfg
ifdef NETWORK_BASE_URL
-MAKENSIS += -DNETWORK_BASE_URL=$(NETWORK_BASE_URL)
+MAKENSIS += -DNETWORK_BASE_URL=$(NETWORK_BASE_URL) -DNOCD=yes
endif
# hard disk
GRUB_MODULES += biosdisk
# partmap
-GRUB_MODULES += pc gpt
+GRUB_MODULES += part_msdos part_gpt
# fs
GRUB_MODULES += fat ntfs ntfscomp
# used in our grub.cfg
-GRUB_MODULES += search linux _linux boot
+GRUB_MODULES += search linux bsd vbe boot
# might be useful for debugging
-GRUB_MODULES += cat cpuid _chain chain halt help ls reboot
+GRUB_MODULES += minicmd cat cpuid chain halt help ls reboot
all: win32-loader.exe g2ldr g2ldr.mbr
core.img:
- grub-mkimage -o $@ --prefix / $(GRUB_MODULES)
+ grub-mkimage --output=$@ --prefix=/win32-loader --format=i386-pc $(GRUB_MODULES)
-g2ldr: /usr/lib/grubutil/g2hdr.bin core.img
+g2ldr: /usr/lib/grub/i386-pc/g2hdr.bin core.img
cat $^ > $@
-g2ldr.mbr: /usr/lib/grubutil/g2ldr.mbr
+g2ldr.mbr: /usr/lib/grub/i386-pc/g2ldr.mbr
cp $^ $@
loadlin.pif: genpif
@@ -44,7 +56,7 @@
win32-loader.exe: main.nsi maps.ini \
templates/binary_choice.ini templates/graphics.ini templates/custom.ini templates/4_choices.ini \
plugins/cpuid/test64.dll plugins/systeminfo/systeminfo.dll plugins/string.dll \
- swirl.ico license loadlin.pif loadlin.exe
+ swirl.ico license loadlin.pif loadlin.exe g2ldr g2ldr.mbr
$(MAKE) -C l10n
$(MAKENSIS) main.nsi
du -h win32-loader.exe
@@ -53,16 +65,16 @@
sed -e "s/@VERSION@/$(VERSION)/g" < $< > $@
plugins/cpuid/test64.dll: plugins/cpuid/cpuid.c plugins/cpuid/plugin.c
- $(CC) $(CFLAGS) $^ -shared -o $@
- $(STRIP) $@
+ $(NSIS_CC) $^ $(NSIS_CFLAGS) -shared -o $@
+ $(NSIS_STRIP) $@
plugins/systeminfo/systeminfo.dll: plugins/systeminfo/systeminfo.c
- $(CC) $(CFLAGS) $^ -shared -o $@
- $(STRIP) $@
+ $(NSIS_CC) $^ $(NSIS_CFLAGS) -shared -o $@
+ $(NSIS_STRIP) $@
plugins/string.dll: plugins/string.c
- $(CC) $(CFLAGS) $^ -shared -o $@
- $(STRIP) $@
+ $(NSIS_CC) $^ $(NSIS_CFLAGS) -shared -o $@
+ $(NSIS_STRIP) $@
iso: stable.iso daily.iso
stable.iso: \
@@ -98,17 +110,17 @@
netboot/download-daily-stamp:
mkdir -p netboot/daily/install.{386,amd}/gtk
- wget http://people.debian.org/~joeyh/d-i/images/daily/netboot/debian-installer/i386/linux \
+ wget http://d-i.debian.org/daily-images/i386/daily/netboot/debian-installer/i386/linux \
-O netboot/daily/install.386/vmlinuz
- wget http://people.debian.org/~joeyh/d-i/images/daily/netboot/debian-installer/i386/initrd.gz \
+ wget http://d-i.debian.org/daily-images/i386/daily/netboot/debian-installer/i386/initrd.gz \
-O netboot/daily/install.386/initrd.gz
- wget http://people.debian.org/~joeyh/d-i/images/daily/netboot/gtk/debian-installer/i386/initrd.gz \
+ wget http://d-i.debian.org/daily-images/i386/daily/netboot/gtk/debian-installer/i386/initrd.gz \
-O netboot/daily/install.386/gtk/initrd.gz
- wget http://people.debian.org/~aba/d-i/images/daily/netboot/debian-installer/amd64/linux \
+ wget http://d-i.debian.org/daily-images/amd64/daily/netboot/debian-installer/amd64/linux \
-O netboot/daily/install.amd/vmlinuz
- wget http://people.debian.org/~aba/d-i/images/daily/netboot/debian-installer/amd64/initrd.gz \
+ wget http://d-i.debian.org/daily-images/amd64/daily/netboot/debian-installer/amd64/initrd.gz \
-O netboot/daily/install.amd/initrd.gz
- wget http://people.debian.org/~aba/d-i/images/daily/netboot/gtk/debian-installer/amd64/initrd.gz \
+ wget http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/initrd.gz \
-O netboot/daily/install.amd/gtk/initrd.gz
touch $@
diff -Nru win32-loader-0.6.10/plugins/cpuid/plugin.c win32-loader-0.6.18/plugins/cpuid/plugin.c
--- win32-loader-0.6.10/plugins/cpuid/plugin.c 2007-09-01 20:09:19.000000000 +0200
+++ win32-loader-0.6.18/plugins/cpuid/plugin.c 2010-04-28 14:29:40.000000000 +0200
@@ -1,21 +1,34 @@
+/*
+ * Copyright (C) 2007,2009 Robert Millan <rmh@aybabtu.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <windows.h>
+#ifdef HAVE_EXDLL_H
#include "exdll.h"
-
-HINSTANCE g_hInstance;
-
-HWND g_hwndParent;
+#else
+#include <nsis/pluginapi.h>
+#endif
void __declspec(dllexport) get_arch (HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra)
{
- g_hwndParent=hwndParent;
-
EXDLL_INIT();
-
setuservariable (INST_0, check_64bit () ? "amd64" : "i386");
}
BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
{
- g_hInstance=hInst;
- return TRUE;
+ return TRUE;
}
diff -Nru win32-loader-0.6.10/plugins/plugin.c win32-loader-0.6.18/plugins/plugin.c
--- win32-loader-0.6.10/plugins/plugin.c 1970-01-01 01:00:00.000000000 +0100
+++ win32-loader-0.6.18/plugins/plugin.c 2010-04-28 14:29:41.000000000 +0200
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2007,2009 Robert Millan <rmh@aybabtu.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <windows.h>
+#ifdef HAVE_EXDLL_H
+#include "exdll.h"
+#else
+#include <nsis/pluginapi.h>
+#endif
+
+BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
+{
+ return TRUE;
+}
diff -Nru win32-loader-0.6.10/plugins/string.c win32-loader-0.6.18/plugins/string.c
--- win32-loader-0.6.10/plugins/string.c 2007-09-01 20:09:19.000000000 +0200
+++ win32-loader-0.6.18/plugins/string.c 2010-04-28 14:29:42.000000000 +0200
@@ -1,6 +1,6 @@
/*
* string.c -- String handling functions
- * Copyright (C) 2007 Robert Millan <rmh@aybabtu.com>
+ * Copyright (C) 2007,2009 Robert Millan <rmh@aybabtu.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,9 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define _WIN32_WINNT 0x0500
#include <windows.h>
+#ifdef HAVE_EXDLL_H
#include "exdll.h"
+#else
+#include <nsis/pluginapi.h>
+#endif
void __declspec (dllexport) bcdedit_extract_id (HWND hwndParent, int string_size, char *variables, stack_t ** stacktop, extra_parameters * extra)
{
diff -Nru win32-loader-0.6.10/plugins/systeminfo/systeminfo.c win32-loader-0.6.18/plugins/systeminfo/systeminfo.c
--- win32-loader-0.6.10/plugins/systeminfo/systeminfo.c 2009-01-03 22:35:31.000000000 +0100
+++ win32-loader-0.6.18/plugins/systeminfo/systeminfo.c 2010-04-28 14:29:41.000000000 +0200
@@ -17,9 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define _WIN32_WINNT 0x0500
#include <windows.h>
+#ifdef HAVE_EXDLL_H
#include "exdll.h"
+#else
+#include <nsis/pluginapi.h>
+#endif
char buf[1024];
diff -Nru win32-loader-0.6.10/TODO win32-loader-0.6.18/TODO
--- win32-loader-0.6.10/TODO 1970-01-01 01:00:00.000000000 +0100
+++ win32-loader-0.6.18/TODO 2010-05-05 18:04:28.000000000 +0200
@@ -0,0 +1,9 @@
+== Unsorted whishlist TODO list for win32-loader ==
+
+* Fix kFreeBSD install:
+ - Include preseed.cfg in ufs1 initrd.gz
+ - Get stable netboot image, make sure it actually works.
+* Re-introduce the distribution name in strings, with `lsb_release --id --short`
+* Introduce a trust chain for the downloaded kernel and initrd's (gpg check with embedded archive key)
+* Get the language selection dropdown menu translated (get l10n specialists advice on that one)
+* Cleanup debian/rules from shell-specific code
Attachment:
signature.asc
Description: This is a digitally signed message part.