--- grub2-1.96+20080724.orig/debian/grub2.postinst +++ grub2-1.96+20080724/debian/grub2.postinst @@ -0,0 +1,25 @@ +#!/bin/sh -e + +case "$1" in + configure) + # transition happened in 1.95-1, but we forgot to issue this warning back then + if [ ! -z "$2" ] && dpkg --compare-versions "$2" lt 1.95-2 ; then + . /usr/share/debconf/confmodule + db_input critical grub2/numbering_scheme_transition || true + db_go + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- grub2-1.96+20080724.orig/debian/grub2.templates +++ grub2-1.96+20080724/debian/grub2.templates @@ -0,0 +1,16 @@ +Template: grub2/numbering_scheme_transition +Type: note +_Description: GRUB 1.95 numbering scheme transition + As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are + now counted starting from 1 rather than 0. This is to make it consistent with + device names of Linux and the other kernels used in Debian. For example, when + using Linux as the kernel, "(hd0,1)" refers to the same partition as the + /dev/sda1 device node. + . + Because of this, there's a chance your system becomes unbootable if + update-grub(8) is run before GRUB is updated, generating a grub.cfg file that + your installed GRUB won't yet be able to parse correctly. To ensure your + system will be able to boot, you have to: + . + - Reinstall GRUB (typically, by running grub-install). + - Rerun update-grub to generate a new grub.cfg. --- grub2-1.96+20080724.orig/debian/grub-pc.dirs +++ grub2-1.96+20080724/debian/grub-pc.dirs @@ -0,0 +1,5 @@ +usr/bin +usr/sbin +usr/share/grub +usr/share/bug/grub-pc +usr/lib/grub-legacy --- grub2-1.96+20080724.orig/debian/grub-pc.prerm +++ grub2-1.96+20080724/debian/grub-pc.prerm @@ -0,0 +1,27 @@ +#!/bin/bash -e + +case "$1" in + remove|deconfigure) + . /usr/share/debconf/confmodule + db_get grub-pc/chainload_from_menu.lst + if $RET && test -e /boot/grub/menu.lst ; then + echo "Saving menu.lst backup in /boot/grub/menu.lst_backup_by_grub2_prerm" >&2 + cp /boot/grub/menu.lst{,_backup_by_grub2_prerm} + echo "Running update-grub Legacy to remove our core.img in it" >&2 + /usr/lib/grub-legacy/update-grub 2>&1 | sed -e "s/^/ /g" >&2 + fi + ;; + failed-upgrade|upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- grub2-1.96+20080724.orig/debian/watch +++ grub2-1.96+20080724/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://alpha.gnu.org/gnu/grub/grub-([0-9.]+).tar.gz debian uupdate --- grub2-1.96+20080724.orig/debian/grub-common.dirs +++ grub2-1.96+20080724/debian/grub-common.dirs @@ -0,0 +1 @@ +usr/sbin --- grub2-1.96+20080724.orig/debian/grub-efi.install +++ grub2-1.96+20080724/debian/grub-efi.install @@ -0,0 +1,5 @@ +debian/presubj usr/share/bug/grub-efi +debian/script usr/share/bug/grub-efi +debian/default etc +debian/grub.d etc +debian/update-grub2 usr/sbin --- grub2-1.96+20080724.orig/debian/rules +++ grub2-1.96+20080724/debian/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f + +SHELL := bash +package := grub2 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +CFLAGS := -g -Wall + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +export CFLAGS +export CXXFLAGS := $(CFLAGS) + +CONFIGURE = CC="cc" CXX="g++" CPPFLAGS="" LDFLAGS="" \ + $(CURDIR)/configure --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --includedir="\$${prefix}/include" \ + --mandir="\$${prefix}/share/man" --infodir="\$${prefix}/share/info" --sysconfdir=/etc --localstatedir=/var \ + --libexecdir="\$${prefix}/lib/$(package)" --disable-maintainer-mode --disable-dependency-tracking --srcdir=$(CURDIR) \ + --enable-grub-emu + +AUTOGEN_FILES = configure config.h.in conf/*.mk + +$(AUTOGEN_FILES): autogen.sh configure.ac conf/*.rmk + ./autogen.sh + +configure/grub-pc configure/grub-ieee1275 configure/grub-efi configure/grub-linuxbios:: $(AUTOGEN_FILES) + mkdir -p $(subst configure/,build/,$@) + cd $(subst configure/,build/,$@) && $(CONFIGURE) --with-platform=$(subst configure/grub-,,$@) + +configure/grub-common:: + mkdir -p build/grub-common + cd build/grub-common && $(CONFIGURE) + +build/grub-pc build/grub-efi build/grub-ieee1275 build/grub-linuxbios:: + $(MAKE) -C $@ + +build/grub-rescue-pc:: build/grub-pc + mkdir -p $@ + mkdir -p $@/rescue-disk/boot/grub + cp docs/grub.cfg $@/rescue-disk/boot/grub/ + $(CURDIR)/build/grub-pc/grub-mkrescue \ + --pkglibdir=$(CURDIR)/build/grub-pc \ + --grub-mkimage=$(CURDIR)/build/grub-pc/grub-mkimage \ + --overlay=$@/rescue-disk/ \ + --image-type=floppy \ + $(CURDIR)/$@/grub-rescue-floppy.img + $(CURDIR)/build/grub-pc/grub-mkrescue \ + --pkglibdir=$(CURDIR)/build/grub-pc \ + --grub-mkimage=$(CURDIR)/build/grub-pc/grub-mkimage \ + --overlay=$@/rescue-disk/ \ + --image-type=cdrom \ + $(CURDIR)/$@/grub-rescue-cdrom.iso + +build/grub-common:: + # Yes, grub-mkdevicemap shouldn't really be here. We're assuming 'pc' + # for i386 and 'ieee1275' for powerpc. Not a big deal though. See + # also debian/patches/04_run_grub_mkdevicemap_when_grub_probe_fails.diff + $(MAKE) -C $@ grub-probe grub-mkdevicemap + +install/grub-pc install/grub-efi install/grub-ieee1275 install/grub-linuxbios:: + $(MAKE) -C $(subst install/,build/,$@) install DESTDIR=$(CURDIR)/debian/$(subst install/,,$@)/ + + # If liblzo2-dev >= 2.03 is installed, it means we're linking with it; this makes sure + # the binary dependency is versioned (for license compatibility). + if dpkg --compare-versions `dpkg -s liblzo2-dev | sed -ne s/^Version:\ //p` ge 2.03 ; then \ + echo "grub-pc:Depends=liblzo2-2 (>= 2.03)" > debian/grub-pc.substvars ; \ + fi + + # shipped with grub-common + rm -f $(CURDIR)/debian/$(subst install/,,$@)/{usr/sbin/grub-{probe,mkdevicemap},usr/share/man/man8/grub-probe.8} + + for i in docs ; do \ + cp debian/$$i.in debian/$(subst install/,,$@).$$i ; \ + done + + i=$(CURDIR)/debian/$(subst install/,,$@)/usr/lib/grub/*/kernel.elf ; if test -e $$i ; then strip -s $$i ; fi + + mkdir -p $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides + cd $(CURDIR)/debian/$(subst install/,,$@) && find ./usr/lib/grub -name \*.mod \ + | sed -e "s%.*%$(subst install/,,$@): unstripped-binary-or-object &%g" \ + > $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) + cd $(CURDIR)/debian/$(subst install/,,$@) && find ./usr/lib/grub -name kernel.elf \ + | sed -e "s%.*%$(subst install/,,$@): statically-linked-binary &%g" \ + >> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) + +clean:: debian/legacy/update-grub + chmod +x debian/{script,grub.d/*,legacy/*} + -rm -f debian/grub-{pc,efi,ieee1275,linuxbios}.docs debian/grub-pc.substvars + -rm -rf build + + # make sure PO files are always up-to-date + debconf-updatepo + +debian/legacy/update-grub: + svn cat svn://svn.debian.org/pkg-grub/grub/trunk/debian/update-grub > $@ + chmod +x $@ + +# Grab fixes from SVN using our version as reference. +svn-sync: + svn co svn://svn.sv.gnu.org/grub/trunk/grub2 grub2-svn; \ + UVERSION=$$(dpkg-parsechangelog | grep Version \ + | sed 's,Version: ,,g;s,-[0-9]*$$,,g;s,\.,_,g'); \ + cd grub2-svn && \ + svn diff -uN -r release_$$UVERSION -r HEAD > ../debian/patches/00_svn-sync.patch; \ + cd .. && rm -rf grub2-svn + +svn-snapshot: + UVERSION=$$(dpkg-parsechangelog | grep Version \ + | sed 's,Version: ,,g;s,-[0-9]*$$,,g'); \ + svn co svn://svn.sv.gnu.org/grub/trunk/grub2 export -d grub2-$$UVERSION -rHEAD grub2; \ + tar -czf grub2_$$UVERSION.orig.tar.gz grub2-$$UVERSION; \ + rm -rf grub2-$$UVERSION; \ + mv grub2_$$UVERSION.orig.tar.gz ../tarballs/ --- grub2-1.96+20080724.orig/debian/presubj +++ grub2-1.96+20080724/debian/presubj @@ -0,0 +1,23 @@ + +MAKE SURE YOU ARE RUNNING THE LATEST VERSION + +On i386-pc, the grub package never updates the installed version of GRUB +automatically (the first time, it may hook itself in GRUB Legacy's menu, +but that's all). + +Because of this, you need to make sure you're running the LATEST VERSION of +GRUB before you report a bug. Use grub-install to update it, and then check +if the bug still applies. Debugging problems we already fixed makes us waste +valuable time, so please try to avoid it. + +IMPORTANT NOTE WHEN SUBMITING PATCHES + +Like many other FSF projects, GRUB upstream has specific requisites for +accepting patches with regard to copyright assignment. If you're going to +submit a patch, it is likely that it will only be accepted in upstream if you're +willing to submit your paperwork as well. + +Because of this, we want to avoid diverging from upstream by adding patches to +the debian package unless we know the copyright issues can be sorted out. We +encourage you to submit your work to upstream directly by sending a mail to the +GRUB maintainers . --- grub2-1.96+20080724.orig/debian/compat +++ grub2-1.96+20080724/debian/compat @@ -0,0 +1 @@ +5 --- grub2-1.96+20080724.orig/debian/grub-pc.templates +++ grub2-1.96+20080724/debian/grub-pc.templates @@ -0,0 +1,27 @@ +Template: grub-pc/chainload_from_menu.lst +Type: boolean +Default: true +_Description: Chainload from menu.lst? + GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub. + . + In order to replace the Legacy version of GRUB in your system, it is + recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 + from your existing GRUB Legacy setup. This step may be automaticaly + performed now. + . + It's recommended that you accept chainloading GRUB 2 from menu.lst, and + verify that your new GRUB 2 setup is functional for you, before you install + it directly to your MBR (Master Boot Record). + . + In either case, whenever you want GRUB 2 to be loaded directly from MBR, + you can do so by issuing (as root) the following command: + . + upgrade-from-grub-legacy + +Template: grub-pc/linux_cmdline +Type: string +Default: fillme +_Description: Linux command line: + The following Linux command line was extracted from the `kopt' parameter + in GRUB Legacy's menu.lst. Please verify that it is correct, and modify + it if necessary. --- grub2-1.96+20080724.orig/debian/grub-pc.install +++ grub2-1.96+20080724/debian/grub-pc.install @@ -0,0 +1,8 @@ +debian/presubj usr/share/bug/grub-pc +debian/script usr/share/bug/grub-pc +debian/default etc +debian/grub.d etc +debian/legacy/update-grub usr/lib/grub-legacy +debian/legacy/grub-set-default usr/sbin +debian/legacy/upgrade-from-grub-legacy usr/sbin +debian/update-grub2 usr/sbin --- grub2-1.96+20080724.orig/debian/grub2.install +++ grub2-1.96+20080724/debian/grub2.install @@ -0,0 +1,2 @@ +debian/presubj usr/share/bug/grub2 +debian/script usr/share/bug/grub2 --- grub2-1.96+20080724.orig/debian/grub-efi.postinst +++ grub2-1.96+20080724/debian/grub-efi.postinst @@ -0,0 +1,22 @@ +#!/bin/sh -e + +case "$1" in + configure) + if test -e /boot/grub/grub.cfg ; then + update-grub + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- grub2-1.96+20080724.orig/debian/grub-linuxbios.install +++ grub2-1.96+20080724/debian/grub-linuxbios.install @@ -0,0 +1,5 @@ +debian/presubj usr/share/bug/grub-linuxbios +debian/script usr/share/bug/grub-linuxbios +debian/default etc +debian/grub.d etc +debian/update-grub2 usr/sbin --- grub2-1.96+20080724.orig/debian/control +++ grub2-1.96+20080724/debian/control @@ -0,0 +1,139 @@ +Source: grub2 +Section: admin +Priority: extra +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: GRUB Maintainers +Uploaders: Jason Thomas , Otavio Salvador , Robert Millan +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), patchutils (>= 0.2.25), autoconf, + ruby, bison, dpkg-dev (>= 1.13.12), po-debconf, + genisoimage [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia], + libc6-dev-i386 [amd64], libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-powerpc [ppc64], + gcc-multilib [amd64 kfreebsd-amd64 ppc64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64 ppc64], + libncurses5-dev, + liblzo2-dev (>= 2.03) [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia] | liblzo-dev [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia], + unifont (>= 1:5.1.20080820-1), + help2man +Build-Conflicts: autoconf2.13, liblzo2-dev (<< 2.02) +Standards-Version: 3.8.0 +Homepage: http://www.gnu.org/software/grub/grub-2.en.html +Vcs-Svn: svn://svn.debian.org/svn/pkg-grub/grub2/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-grub/grub2/ + + +Package: grub2 +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 +Depends: ${misc:Depends} , grub-pc [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia] | grub-ieee1275 [powerpc ppc64] +Description: GRand Unified Bootloader, version 2 (dummy package) + This is a dummy transitional package to handle GRUB 2 upgrades. It can be + safely removed. + +Package: grub-of +Architecture: powerpc ppc64 +Depends: grub-ieee1275 (= ${Source-Version}) +Description: GRand Unified Bootloader, version 2 [dummy] + This is a dummy transitional package that depends on grub-ieee1275. + + +Package: grub-common +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 +Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1~) +Replaces: grub-pc (<< 1.96+20080426-3), grub-ieee1275 (<< 1.96+20080426-3), grub-linuxbios (<< 1.96+20080426-3), grub-efi (<< 1.96+20080426-3) +Suggests: multiboot-doc [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia] +Description: GRand Unified Bootloader, version 2 (common files) + This package contains common files shared by the distinct flavours of GRUB. + +Package: grub-pc +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (>> 1.96+20080413-1), ${grub-pc:Depends}, os-prober +Provides: grub +Replaces: pupa, grub, grub2 (<< ${Source-Version}), grub-common (<= 1.96+20080413-1) +Conflicts: pupa, grub, desktop-base (= 4.0.5) +Suggests: desktop-base (>= 4.0.6) +Description: GRand Unified Bootloader, version 2 (PC/BIOS version) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub2. + - VESA-based graphical mode with background image support and complete 24-bit + color set. + - Support for extended charsets. Users can write UTF-8 text to their menu + entries. + . + This package contains a version of GRUB that has been built for use with + traditional PC/BIOS architecture. + +Package: grub-rescue-pc +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Depends: base-files (>= 4.0.1~) +Description: GRUB bootable rescue images, version 2 (PC/BIOS version) + This package contains two GRUB rescue images that have been built for use with + traditional PC/BIOS architecture: + . + - grub-rescue-floppy.img: floppy image. + - grub-rescue-cdrom.iso: El Torito CDROM image. + +Package: grub-linuxbios +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (>> 1.96+20080413-1) +Provides: grub +Replaces: pupa, grub, grub2 (<< ${Source-Version}), grub-common (<= 1.96+20080413-1) +Conflicts: pupa, grub +Suggests: os-prober +Description: GRand Unified Bootloader, version 2 (LinuxBIOS version) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub2. + . + This package contains a version of GRUB that has been built for use with + platforms running the LinuxBIOS firmware. + +Package: grub-efi +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (>> 1.96+20080413-1) +Provides: grub +Replaces: pupa, grub, grub2 (<< ${Source-Version}), grub-common (<= 1.96+20080413-1) +Conflicts: pupa, grub +Suggests: os-prober +Description: GRand Unified Bootloader, version 2 (EFI version) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub2. + . + This package contains a version of GRUB that has been built for use with + EFI architecture, such as the one provided by Intel Macs (that is, unless a + BIOS interface has been activated). + +Package: grub-ieee1275 +Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (>> 1.96+20080413-1), + powerpc-ibm-utils [powerpc ppc64], powerpc-utils [powerpc ppc64], bc [powerpc ppc64] +Provides: grub +Replaces: pupa, grub, grub2 (<< ${Source-Version}), grub-common (<= 1.96+20080413-1) +Conflicts: pupa, grub +Suggests: os-prober +Description: GRand Unified Bootloader, version 2 (Open Firmware version) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub2. + . + This package contains a version of GRUB that has been built for use with + Open Firmware implementations. --- grub2-1.96+20080724.orig/debian/script +++ grub2-1.96+20080724/debian/script @@ -0,0 +1,23 @@ +#!/bin/bash -e + +if test -e /boot/grub/setup_left_core_image_in_filesystem ; then + echo -e "\n*********************** WARNING grub-setup left core.img in filesystem" >&3 +fi + +for i in /proc/mounts ; do + if test -e $i ; then + echo -e "\n*********************** BEGIN $i" >&3 + grep ^/dev/ $i >&3 + echo "*********************** END $i" >&3 + fi +done + +for i in /boot/grub/{device.map,grub.cfg} ; do + if test -e $i ; then + echo -e "\n*********************** BEGIN $i" >&3 + cat $i >&3 + echo "*********************** END $i" >&3 + fi +done + +exit 0 --- grub2-1.96+20080724.orig/debian/copyright +++ grub2-1.96+20080724/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Robert Millan on +Mon, 15 Sep 2003 14:58:42 +0000. + +It was downloaded from http://www.gnu.org/software/grub/ + +Copyright: Free Software Foundation + +License: + + GRUB 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. + + GRUB 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 GRUB. If not, see . + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- grub2-1.96+20080724.orig/debian/grub-pc.postinst +++ grub2-1.96+20080724/debian/grub-pc.postinst @@ -0,0 +1,73 @@ +#!/bin/bash -e + +case "$1" in + configure) + . /usr/share/debconf/confmodule + mkdir -p /boot/grub + + if test -e /boot/grub/device.map && ! test -e /boot/grub/core.img ; then + # Looks like your device.map was generated by GRUB Legacy, which + # used to generate broken device.map (see #422851). Avoid the risk + # by regenerating it. + grub-mkdevicemap --no-floppy + fi + + if test -e /boot/grub/menu.lst ; then + db_get grub-pc/linux_cmdline + if [ "$RET" == "fillme" ] ; then + # wtf?! + echo "Internal error in grub-pc package. Please file a bug report." >&2 + exit 1 + elif [ "$RET" != "" ] ; then + # escape \ and / + RET=`echo "$RET" | sed -e 's,[\/],\\\&,g'` + sed -i /etc/default/grub -e "s/^\(GRUB_CMDLINE_LINUX\)=.*/\1=\"$RET\"/g" + db_set grub-pc/linux_cmdline "" || true + fi + fi + + db_get grub-pc/chainload_from_menu.lst + if $RET && test -e /boot/grub/menu.lst && ! test -e /boot/grub/core.img ; then + # If there's no core.img setup, create one (but do not risk writing to MBR). + if ! test -e /boot/grub/core.img ; then + echo "Generating core.img" >&2 + grub-install --no-floppy --grub-setup=/bin/true "(hd0)" > /dev/null + fi + + # Update menu.lst to reflect that: + # - core.img is present now + # - core.img has to be the first option + echo "Saving menu.lst backup in /boot/grub/menu.lst_backup_by_grub2_postinst" >&2 + cp /boot/grub/menu.lst{,_backup_by_grub2_postinst} + echo "Running update-grub Legacy to hook our core.img in it" >&2 + LET_US_TRY_GRUB_2=true /usr/lib/grub-legacy/update-grub 2>&1 | sed -e "s/^/ /g" >&2 + # We just hooked GRUB 2 in menu.lst; then also generate grub.cfg. + update-grub + else # this `else' is mostly intended to avoid running update-grub twice + # If grub.cfg has been generated, update it. + if test -e /boot/grub/grub.cfg ; then + update-grub + fi + fi + + # /boot/grub/ has more chances of being accessible by GRUB + for i in /usr/share/grub/ascii.pff /usr/share/images/desktop-base/moreblue-orbit-grub.png ; do + if test -e $i ; then + cp $i /boot/grub/ + fi + done + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- grub2-1.96+20080724.orig/debian/changelog +++ grub2-1.96+20080724/debian/changelog @@ -0,0 +1,1235 @@ +grub2 (1.96+20080724-12ubuntu2.1) jaunty-proposed; urgency=low + + * debian/legacy/update-grub: fix generation to use select uuid for the + root specifier when the groot is a UUID. Use the same test as is used + in the 'grub' package. LP: #376879 + + -- Andy Whitcroft Fri, 15 May 2009 12:01:11 +0100 + +grub2 (1.96+20080724-12ubuntu2) jaunty; urgency=low + + * Build for lpia. + + -- Colin Watson Wed, 25 Feb 2009 18:28:37 +0000 + +grub2 (1.96+20080724-12ubuntu1) jaunty; urgency=low + + * Merge from Debian Unstable (LP: #298872, LP: #256578). + Remaining Ubuntu changes: + + debian/control: + - Depend on rather than Suggest os-prober; Ubuntu version does not + suffer from the mount problem that prevents Debian from marking this + Depends. + + debian/default/grub + - Adjust for default Ubuntu boot options. + - Use new GRUB_CMDLINE_LINUX_DEFAULT option to set "quiet splash" for + default items only. These options won't be set in single user mode. + + debian/patches/03_ubuntu_grub_standards + - Remove GNU/Linux from default string. + * New upstream snapshot includes ext4 extents support (LP: #294763) + * Debian patch 02_dpkg_version_comparison.diff fixes kernel ordering + (LP: #215513) + * debian/patches/04_uuids_and_abstraction_dont_play_along_nicely: + + Drop. Ubuntu's mdadm and lvm properly populate /dev/disk/by-uuid, so + this workaround is unnecessary. + * debian/changelog: + + Drop duplicated 1.96+20080203-1ubuntu2 and 1.96+20080203-1ubuntu1 + entries. We only really need them in there once! + * Drop debian/patches/04_convert_root_uuid: + - GRUB2 upstream now uses UUIDs when possible. + + -- Christopher James Halse Rogers Mon, 17 Nov 2008 10:06:18 +1100 + +grub2 (1.96+20080724-12) unstable; urgency=high + + [ Updated translations ] + * Italian (it.po) by Luca Monducci. (Closes: #504076) + * Swedish (sv.po) by Martin Ågren. (Closes: #504207) + * Arabic (ar.po) by Ossama Khayat. (Closes: #504254) + * Portuguese (pt.po) by Miguel Figueiredo. (Closes: #504280) + * Russian (ru.po) by Yuri Kozlov. (Closes: #504324) + * Finnish (fi.po) by Esko Arajärvi. (Closes: #504310) + * Basque (eu.po) by Piarres Beobide. (Closes: #504466) + * Dutch (nl.po) by Paul Gevers. (Closes: #504683) + + [ Robert Millan ] + * Update to new debian theme. + - grub-pc.postinst: Switch to moreblue-orbit-grub.png. + - grub.d/05_debian_theme: Likewise. + + -- Robert Millan Mon, 10 Nov 2008 16:18:14 +0100 + +grub2 (1.96+20080724-11) unstable; urgency=high + + [ Felix Zielcke ] + * patches/00_trailing_slash.diff: New patch to remove the trailing slash on + grub prefix to avoid a double slash, which is a problem for JFS. + (Closes: #500112) + * patches/00_lvm_circular_metadata.diff: New patch to handle circular LVM + metadata. (Closes: #462835, #502953) + * Make grub-pc/linux_cmdline debconf template translatable. (Closes #503478). + + [ Robert Millan ] + * Fix NULL dereference and failure paths in LVM. Thanks Guillem Jover. + (Closes: #500482) + - patches/11_lvm-Fix-possible-NULL-value-handling.diff + - patches/12_lvm-Fix-error-recovery-by-only-adding-objects-when.diff + + [ Updated translations ] + * Dutch (nl.po) by Paul Gevers. (Closes: #500514) + * French (fr.po) by Christian Perrier. (Closes: #503708) + * Georgian (ka.po) by Aiet Kolkhi. (Closes: #503715) + * Czech (cs.po) by Miroslav Kure. (Closes: #503809) + * German (de.po) by Helge Kreutzmann. (Closes: #503841) + * Japanese (ja.po) by Hideki Yamane. (Closes: #503869) + + -- Robert Millan Wed, 29 Oct 2008 19:27:00 +0100 + +grub2 (1.96+20080724-10) unstable; urgency=high + + * patches/03_disable_floppies.diff: Free .drive struct member when skipping + floppy drives. (Closes: #496040) + * patches/902_boot_blocklist_hack.diff: Support separate /boot when using + blocklists. (Closes: #496820, #489287, #494589) + * patches/00_ntfs_insensitive.diff: They say NTFS is an insensitive fool. + It must be true! (use case insensitive match in NTFS) (Closes: #497889) + + -- Robert Millan Sat, 6 Sep 2008 14:56:38 +0200 + +grub2 (1.96+20080724-9) unstable; urgency=high + + [ Felix Zielcke ] + * Remove build-depency of unifont-bin and bump version of unifont to + (>= 1:5.1.20080820-1), this avoids licensing problems (Closes: #496061) + * patches/00_skip_dev_leading_dot.diff: Add patch from Robert to skip + all devices which start with a dot not just directories (Closes: #486624) + * Fix a bit the changelog entry from me of previous version + - Colon missing on `Closes' for #494383. + - #464215 was on wrong line, it's about LVM dash problem not /dev/md/N. + - Align to 80 chars. + * patches/02_mdraid_sb_raid_disks.diff: Use raid_disks field of the mdraid + superblock instead of nr_disks (Closes: #496573) + + [ Robert Millan ] + * Detect when grub-setup leaves core.img in filesystem, and include that + info in bug report templates. + - debian/patches/08_core_in_fs.diff + - debian/script + * Remove a red herring error message so that the real errors are displayed + (does not fix, but problem can be seen in #496040) + - debian/patches/00_kern_device_red_herring.diff + + -- Robert Millan Tue, 26 Aug 2008 23:40:47 +0200 + +grub2 (1.96+20080724-8) unstable; urgency=high + + [ Felix Zielcke ] + * patches/00_fix_raid0.diff: Fix a `small' incorrect calculation for raid 0. + * patches/09_handle_md_slash_N.diff: Add support for /dev/md/N style mdraid + devices. (Closes: #475585) + * patches/10_handle_lvm_dash_escaping.diff: LVM escapes a dash with a dash + and GRUB doestn't like that, so remove the double dashes. (Closes: #494383, + #464215) + + [ Robert Millan ] + * Handle errors in RAID/LVM scan routine (rather than letting the upper + layer cope with them). (Closes: #494501, #495049) + - debian/patches/00_raid_lvm_error_handling.diff: Fix the actual problem. + - debian/patches/00_grub_print_error.diff: Fix a bug exposed by + 00_raid_lvm_error_handling.diff. + + -- Felix Zielcke Sat, 23 Aug 2008 15:04:22 +0200 + +grub2 (1.96+20080724-7) unstable; urgency=high + + * Make build-dependency on unifont-bin versioned (<< 1:5.1.20080706-1) + (or unifont >= 1:5.1.20080808-2) to avoid being hit by #494473. + (Closes: #494460) + * patches/02_dpkg_version_comparison.diff: Replace with + patches/901_dpkg_version_comparison.diff (new patch), based on the + implementation in grub 0.97-46. (Closes: #494158) + + -- Robert Millan Sat, 9 Aug 2008 21:21:00 +0200 + +grub2 (1.96+20080724-6) unstable; urgency=high + + * patches/02_old_linux_version_comparison.diff: Replace with ... + * patches/02_dpkg_version_comparison.diff: ... this. + Use dpkg --compare-versions in update-grub. (Closes: #494158) + * fixed 2 double slashes in the spanish translation (es.po) (Closes: #493744) + + -- Felix Zielcke Sun, 03 Aug 2008 17:53:33 +0200 + +grub2 (1.96+20080724-5) unstable; urgency=high + + [ Felix Zielcke ] + * patches/00_getline.diff: Fix access to a pointer which has been free'd + before in the configline parser from grub's menu (Closes: #493289) + * patches/00_fix_double_prefix.diff: Fix double prefix with chainloading + from grub-legacy (Closes: #487565) + + [ Updated translations ] + * Japanese (ja.po) by Hideki Yamane (Closes: #493347) + + [ Robert Millan ] + * patches/07_skip_invalid_bsd_parts.diff: Add patch from Felix to skip + invalid/corrupt partitions gracefuly. (Closes: #478238) + + -- Robert Millan Sat, 2 Aug 2008 22:49:05 +0200 + +grub2 (1.96+20080724-4) unstable; urgency=high + + * patches/00_fix_overflow.diff: fix overflow with a big grub.cfg. + (Closes: #473543) + + -- Felix Zielcke Tue, 29 Jul 2008 17:10:59 +0200 + +grub2 (1.96+20080724-3) unstable; urgency=low + + [ Felix Zielcke ] + * changed depency for debconf to also support debconf-2.0. (Closes: #492543) + * patches/00_xfs.diff: Fix "out of partition" error with XFS. + (Closes: #436943) + + [ Robert Millan ] + * patches/00_raid_duped_disks.diff: Do not abort when two RAID disks with + the same number are found. (Closes: #492656) + * patches/00_strengthen_apple_partmap_check.diff: Be more strict when probing + for Apple partition maps (this prevents false positives on i386-pc + installs). (Closes: #475718) + + -- Robert Millan Tue, 29 Jul 2008 00:48:01 +0200 + +grub2 (1.96+20080724-2) unstable; urgency=high + + [ Felix Zielcke ] + * fixed lintian override for kernel.elf + * debian/rules: changed cvs targets to use svn + + [ Robert Millan ] + * patches/00_skip_dev_dm.diff: Skip /dev/dm-[0-9] devices also (implicitly) + for RAID. (Closes: #491977) + * patches/00_uuid_boot.diff: Fix cross-disk installs by using UUIDs. + (Closes: #492204) + + -- Robert Millan Sat, 26 Jul 2008 01:06:07 +0200 + +grub2 (1.96+20080724-1) unstable; urgency=high + + * New SVN snapshot. + - Support for ext4dev extents. + - patches/00_speed_up_font_load.diff: Remove (merged). + + [ Felix Zielcke ] + * upgrade-from-grub-legacy now calls update-grub if grub.cfg doestn't exist + and prints a big warning if it failed. + * Update Standards version to 3.8.0. No changes need. + * Added Build-Dep for po-debconf and a lintian override, to make it happy. + + [ Updated translations ] + * Swedish (sv.po) by Martin Ågren (Closes: #492056) + + [ Robert Millan ] + * Revert r844. grub-coreboot is stuck on NEW, and it was too early + for branching. + + -- Robert Millan Thu, 24 Jul 2008 13:27:53 +0200 + +grub2 (1.96+20080717-1) experimental; urgency=low + + * New SVN snapshot. + - Provides LZMA support (not yet used in the package). + - Fix grub-mkrescue manpage generation. (Closes: #489440) + + * Rename grub-linuxbios to grub-coreboot (and leave a dummy grub-linuxbios + package to handle upgrades). + + [ Updated translations ] + * Spanish (es.po) by Maria Germana Oliveira Blazetic (Closes: #489877) + * Portuguese (pt.po) by Ricardo Silva (Closes: #489807) + + -- Robert Millan Sat, 12 Jul 2008 17:47:09 +0200 + +grub2 (1.96+20080704-2) unstable; urgency=high + + * patches/02_old_linux_version_comparison.diff: Set interpreter to /bin/bash. + (Closes: #489426, #489446) + + -- Robert Millan Mon, 7 Jul 2008 15:17:58 +0200 + +grub2 (1.96+20080704-1) unstable; urgency=high + + * New SVN snapshot. + * default/grub: Add commented example to disable graphical terminal. + * Use substvars to support linking with liblzo1. + * Bring 03_disable_floppies.diff to pre-r805 state. (Closes: #488375) + * patches/02_old_linux_version_comparison.diff: New patch. Steal version + comparison code from GRUB Legacy's update-grub. (Closes: #464086, #489133) + * patches/00_speed_up_font_load.diff: New patch. Generate font files with + only the needed characters. (Closes: #476479, #477083) + + -- Robert Millan Fri, 4 Jul 2008 21:39:07 +0200 + +grub2 (1.96+20080626-1) unstable; urgency=high + + * New CVS snapshot. + - Avoids passing UUID to Linux when not using initrd. (Closes: #484228) + - patches/04_uuids_and_abstraction_dont_play_along_nicely.diff: Resync. + + -- Robert Millan Thu, 26 Jun 2008 16:43:48 +0200 + +grub2 (1.96+20080621-1) unstable; urgency=high + + * Urgency set to "high" because of #482688. + * New CVS snapshot. + - Fix module load hook in prepare_grub_to_access_device(). + (Closes: #486804) + - Call prepare_grub_to_access_device() before accessing devices, never + afterwards. (Closes: #487198) + * grub.d/05_debian_theme: Prefer /boot/grub over /usr for image + loading, since chances are it's less LVMed. + + -- Robert Millan Sat, 21 Jun 2008 15:52:48 +0200 + +grub2 (1.96+20080617-1) unstable; urgency=low + + * New CVS snapshot. + - Supports IDA block devices. (Closes: #483858) + - Fixes some problems in ext2/ext3. (Closes: #485068, #485065) + - Uses EUID instead of UID in update-grub. (Closes: #486043, #486039, + #486040, #486041). + - Fixes incomplete I2O device support. Thanks Sven Mueller. + (Closes: #486505) + - Fixes recent regressions in fs/ext2.c. (Closes: #485279) + - Only use UUIDs when requested device is not the same as the one + providing /boot. (Closes: #486119) + - patches/02_libgcc_powerpc_hack.diff: Remove. Probably not needed + anymore. + - patches/04_uuids_and_abstraction_dont_play_along_nicely.diff: Update. + * patches/06_olpc_prefix_hack.diff: Hardcode prefix to (sd,1) on OLPC. + * Refurbish 03_disable_floppy_support_in_util_biosdisk.diff into + 03_disable_floppies.diff. + + -- Robert Millan Tue, 17 Jun 2008 01:07:52 +0200 + +grub2 (1.96+20080601-2) unstable; urgency=low + + * 04_run_grub_mkdevicemap_when_grub_probe_fails.diff: Remove. Argueably + makes grub-probe unreliable and is quite annoying. + * 04_uuids_and_abstraction_dont_play_along_nicely.diff: New patch. Disable + UUID parameter to Linux when LVM or dmRAID is in use. (Closes: #484228) + This is a workaround for bug #484297 in udev. + + -- Robert Millan Tue, 3 Jun 2008 16:29:53 +0200 + +grub2 (1.96+20080601-1) unstable; urgency=low + + * New CVS snapshot. + - patches/06_backward_compat_in_uuid_support.diff: Merged. + - Fixes NULL pointer dereference in biosdisk.c. (Closes: #483895, #483900) + - Extends UUID support for XFS and ReiserFS. + + -- Robert Millan Sun, 1 Jun 2008 15:44:08 +0200 + +grub2 (1.96+20080531-1) unstable; urgency=low + + * New CVS snapshot. + - Work around BIOS bug affecting keyboard on macbooks. (Closes: #482860) + - Adjust grub.d/05_debian_theme to use the new UUID-compatible API. + - default/grub: Add commented GRUB_DISABLE_LINUX_UUID variable. + - patches/06_backward_compat_in_uuid_support.diff: New. Make update-grub + generate code that is compatible with older GRUB installs. + - util/biosdisk.c no longer complains about duplicated device.map entries. + (Closes: #481236) + + [ Updated translations ] + * Galician (gl.po) by Jacobo Tarrio (Closes: #480977) + + -- Robert Millan Sat, 31 May 2008 00:02:54 +0200 + +grub2 (1.96+20080512-1ubuntu2) intrepid; urgency=low + + [ Onkar Shinde ] + * debian/patches: + - Add 03_ubuntu_grub_standards to remove GNU/Linux from the + default string. (LP: #192955) Don't show splash screen or quiet mode + in single user mode. + - Add 04_convert_root_uuid.diff to default to using UUIDs + on new GRUB2 installations. (LP: #192956) + * debian/control: + - Move os-prober to 'Depends' since Ubuntu version does not suffer from + the mount problem in Debian version. 'os-prober' is needed for probing + other operating systems. (LP: #214642) + * Other bugs fixed - LP: #219580 + + [ Mario Limonciello ] + * Add items from missed merge bug (LP: #234288) + + -- Onkar Shinde Fri, 23 May 2008 14:28:36 +0530 + +grub2 (1.96+20080512-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Adjust debian/default/grub for default Ubuntu boot options. + + -- Mario Limonciello Tue, 27 May 2008 11:32:41 -0500 + +grub2 (1.96+20080512-1) unstable; urgency=low + + * New CVS snapshot. + - Adds support for default-only Linux cmdline options. (Closes: #460843) + - Supports Xen virtual block devices. (Closes: #456777) + - Supports Virtio block devices. (Closes: #479056) + - Supports CCISS block devices. (Closes: #479735) + - Fixes handling of more LVM abnormal conditions. (Closes: #474343, + #474931, #477175) + + * Switch to liblzo2 now that it's GPLv3-compatible. (Closes: #466375) + * grub-pc.postinst: Escape \ and / in cmdline sed invokation. + (Closes: #479279) + + [ Updated translations ] + * Italian (it.po) by Luca Monducci (Closes: #480740) + + -- Robert Millan Mon, 12 May 2008 17:46:38 +0200 + +grub2 (1.96+20080429-1) unstable; urgency=high + + * New CVS snapshot. + - Includes sample grub.cfg file; we use it for grub-rescue-pc. + (Closes: #478324) + * grub-common: Upgrade Replaces to << 1.96+20080426-3. (Closes: #478224, + #478353, #478144) + + [ Updated translations ] + * French (fr.po) by Christian Perrier (Closes: #471291) + + -- Robert Millan Tue, 29 Apr 2008 13:27:52 +0200 + +grub2 (1.96+20080426-1) unstable; urgency=high + + * New CVS snapshot. + - Fixes syntax error when setting GRUB_PRELOAD_MODULES. (Closes: #476517) + * Move os-prober to Suggests, to avoid trouble with #476184. + (Closes: #476684) + * patches/04_run_grub_mkdevicemap_when_grub_probe_fails.diff: New patch, + does what its name says. (Closes: #467127) + - Also move grub-mkdevicemap from grub-pc to grub-common, so that GRUB + Legacy can use it. + + [ Updated translations ] + * Basque (eu.po) by Piarres Beobide (Closes: #476708) + + -- Robert Millan Sat, 26 Apr 2008 20:06:55 +0200 + +grub2 (1.96+20080413-1) unstable; urgency=high + + * New CVS snapshot. + - Provides 30_os-prober update-grub add-on. Thanks Fabian Greffrath. + (Closes: #461442) + - Improves robustness when handling LVM. + (Closes: #474931, #474343) + * patches/03_disable_floppy_support_in_util_biosdisk.diff: New. Does + what its name says. (Closes: #475177) + + -- Robert Millan Sun, 13 Apr 2008 13:53:28 +0200 + +grub2 (1.96+20080408-1) unstable; urgency=low + + * New CVS snapshot. + - grub-probe skips non-existant devices when processing device.map. + (Closes: #473209) + * control: Fix syntax error. + + [ Updated translations ] + * Finnish (fi.po) by Esko Arajärvi (Closes: #468641) + + -- Robert Millan Tue, 8 Apr 2008 15:45:25 +0200 + +grub2 (1.96+20080228-1) unstable; urgency=low + + * New CVS snapshot. + * Split grub-probe into grub-common package. Make all flavours depend on it. + (Closes: #241972) + * Suggest multiboot-doc. + * patches/01_grub_legacy_0_based_partitions.diff: New patch. Add a hack that + tells grub-probe you want 0-based partition count + (GRUB_LEGACY_0_BASED_PARTITIONS variable) + * Stop depending on lsb-release (too heavy! we don't need python in base). + Instead of assuming it's there, try calling it and otherwise just echo + Debian. + + -- Robert Millan Thu, 28 Feb 2008 16:43:40 +0100 + +grub2 (1.96+20080219-3) unstable; urgency=low + + * default/grub: Use lsb_release to support Debian derivatives. + (Closes: #466561) + * grub.d/05_debian_theme: Only setup background image when a reader for it + is present in /boot/grub. (Closes: #467111) + + [ Updated translations ] + * Russian (ru.po) by Yuri Kozlov (Closes: #467181) + + -- Robert Millan Sun, 24 Feb 2008 15:39:50 +0100 + +grub2 (1.96+20080219-2) unstable; urgency=high + + * grub-pc.postinst: Create /boot/grub if it doesn't exist. + + -- Robert Millan Wed, 20 Feb 2008 07:15:14 +0100 + +grub2 (1.96+20080219-1) unstable; urgency=high + + * New CVS snapshot. + - Improves GPT support, allowing it to work without blocklists. + + -- Robert Millan Tue, 19 Feb 2008 15:05:10 +0100 + +grub2 (1.96+20080216-1) unstable; urgency=high + + * New CVS snapshot. + - Fixes offset calculation issue when installing on GPT (urgency set + to high because of this). + * Fix Vcs-Browser tag. Thanks James. (Closes: #465697) + * Only process grub-pc/linux_cmdline if /boot/grub/menu.lst exists. + (Closes: #465708) + + [ Updated translations ] + * French (fr.po) by Christian Perrier (Closes: #465706) + + -- Robert Millan Sat, 16 Feb 2008 23:30:55 +0100 + +grub2 (1.96+20080213-1) unstable; urgency=low + + * New CVS snapshot. + - Failure to read one device in a RAID-1 array no longer causes boot + to fail (so long as there's a member that works). (Closes: #426341) + * script: For /proc/mounts, only report lines that start with /dev/. + * Add new upgrade-from-grub-legacy script for the user to complete the upgrade + process from GRUB Legacy, and advertise it prominently in menu.lst. + (Closes: #464912) + * Add a hack to support gfxterm / background_image on systems where /usr + isn't accessible. (Closes: #464911, #463144) + - grub-pc.postinst + - grub.d/05_debian_theme + * Fix a pair of spelling mistakes in debconf. (Closes: #465296) + * Migrate kopt from menu.lst. (Closes: #461164, #464918) + + [ Updated translations ] + * Portuguese (pt.po) by Ricardo Silva (Closes: #465137) + * German (de.po) by Helge Kreutzmann (Closes: #465295) + + -- Robert Millan Wed, 13 Feb 2008 16:37:13 +0100 + +grub2 (1.96+20080210-1) unstable; urgency=high + + * New CVS snapshot. + - Errors that cause GRUB to enter rescue mode are displayed now. + (Closes: #425149) + - Build LVM/RAID modules into a few commands that were missing them + (notably, grub-setup). (Closes: #465033) + * Fix license violation (incompatibility between GRUB and LZO2). + (Closes: #465056) + - Urgency set to high. + - control: Move liblzo2-dev from Build-Depends to Build-Conflicts + (leaving liblzo-dev as the only option). + + -- Robert Millan Sun, 10 Feb 2008 17:09:15 +0100 + +grub2 (1.96+20080209-1) unstable; urgency=low + + * New CVS snapshot. + - Fix a root device setting issue in grub-setup. (Closes: #463391) + - Fix partmap detection under LVM/RAID. + - Add scripting commands that would allow user to implement hiddenmenu-like + functionality (http://grub.enbug.org/Hiddenmenu). + - Provide manpages for grub-setup, grub-emu, grub-mkimage and others. + (Closes: #333516, #372890) + * Fix a pair of spelling errors in debconf templates. Thanks Christian + Perrier. (Closes: #464133) + * Run debconf-updatepo. (Closes: #463918) + * Lower base-files versioned dependency to >= 4.0.1~bpo40+1. + + -- Robert Millan Sat, 9 Feb 2008 13:43:49 +0100 + +grub2 (1.96+20080203-1ubuntu2) hardy; urgency=low + + * Update 03_ubuntu_grub_standards. + - Don't show splash screen or quiet mode in single user mode. + + -- Mario Limonciello Wed, 05 Mar 2008 19:05:04 -0600 + +grub2 (1.96+20080203-1ubuntu1) hardy; urgency=low + + * debian/default/grub + - Show lsb_release rather than statically displaying "Debian" (LP: #192955) + - Include Ubuntu specific "quiet splash" on default grub command line. + (LP: #193024) + * debian/patches: + - Add 03_ubuntu_grub_standards to remove GNU/Linux from the + default string. (LP: #192955) + - Add 04_convert_root_uuid.diff to default to using UUIDs + on new GRUB2 installations. (LP: #192956) + * debian/control: + - Update maintainer per XSBC-Original-Maintainer spec. + + -- Mario Limonciello Mon, 18 Feb 2008 14:05:06 -0600 + +grub2 (1.96+20080203-1) unstable; urgency=low + + * New CVS snapshot (and release, but we skipped that ;-)) + - patches/01_regparm.diff: Delete. + - Improved XFS support. + - util/grub.d/00_header.in: Add runtime error detection (for gfxterm). + - Fixes problem when chainloading to Vista. + * Fix po-debconf errors. Thanks Thomas Huriaux. (Closes: #402972) + * grub.d/05_debian_theme: + - Add runtime error detection. + - Detect/Enable PNG background when it is present. + * control (grub-ieee1275): Remove versioned dependency on powerpc-ibm-utils. + + -- Robert Millan Sun, 3 Feb 2008 19:31:23 +0100 + +grub2 (1.95+20080201-1) unstable; urgency=low + + * New CVS snapshot. + * presubj: Improve notice. + * patches/01_regparm.diff: Fix CPU context corruption affecting fs/xfs.c. + (Closes: #463081, #419766, #462159) + * patches/02_libgcc_powerpc_hack.diff: Fix FTBFS on powerpc. (Closes: #457491) + * patches/disable_xfs.diff: Actually remove this time... + + -- Robert Millan Fri, 1 Feb 2008 17:06:00 +0100 + +grub2 (1.95+20080128-1) unstable; urgency=low + + * New CVS snapshot. + - Fixes bogus CLAIM problems on Apple firmware. (Closes: #449135, #422729) + - grub-probe performs sanity checks to make sure our filesystem drivers + are usable. (Closes: #462449) + - patches/disable_ata.diff: Remove. ATA module isn't auto-loaded in + rescue floppies now. + - patches/disable_xfs.diff: Remove. See above (about grub-probe). + * Bring back grub-emu; it can help a lot with debugging feedback. + - control + - rules + + -- Robert Millan Mon, 28 Jan 2008 00:01:11 +0100 + +grub2 (1.95+20080116-2) unstable; urgency=low + + * grub.d/05_debian_theme: Enable swirlish beauty. + * rules: Obtain debian/legacy/update-grub dynamicaly from GRUB Legacy svn. + + -- Robert Millan Sat, 19 Jan 2008 13:16:18 +0100 + +grub2 (1.95+20080116-1) unstable; urgency=low + + * New CVS snapshot. + - update-grub ignores stale *.dpkg-* files. (Closes: #422708, #424223) + - LVM/RAID now working properly (except when it affects /boot). + (Closes: #425666) + - Fixes flickery in timeout message. (Closes: #437275) + * grub-pc.postinst: Use `--no-floppy' whenever possible. Die, floppies, + die! + * Resync with latest version of GRUB Legacy's update-grub. This time, + using the $LET_US_TRY_GRUB_2 hack to reuse the same script both for + addition of core.img and its removal. + * grub-*.install: Add update-grub2 stub. Packages providing /etc/grub.d/ + scripts should invoke update-grub2 in both postinst and postrm (whenever + it is found, of course). + * control: Reorganize a bit, including a complete rewrite of the + package descriptions. + * control (grub-ieee1275): Enable for i386/amd64. + + -- Robert Millan Wed, 16 Jan 2008 15:00:54 +0100 + +grub2 (1.95+20080107-1) unstable; urgency=low + + * New CVS snapshot. + - Supports ReiserFS. (Closes: #430742) + - patches/disable_ata.diff: Resync. + + -- Robert Millan Mon, 7 Jan 2008 12:46:39 +0100 + +grub2 (1.95+20080105-2) unstable; urgency=low + + * grub-pc.postinst: Fix covered assumption that menu.lst exists. + (Closes: #459247) + * copyright: Fix copyright/license reference. + + -- Robert Millan Sun, 6 Jan 2008 18:02:28 +0100 + +grub2 (1.95+20080105-1) unstable; urgency=low + + * New CVS snapshot. + - Fixes install on non-devfs systems with devfs-style paths (ouch). + (Closes: #450709). + - Fixes boot of "Linux" zImages (including memtest86+). (Closes: #436113). + - Corrects usage message in grub-setup. (Closes: #458600). + - patches/menu_color.diff: Remove. Made obsolete by `menu_color_normal' + and `menu_color_highlight' variables. Add/install grub.d/05_debian_theme + to make use of them. + * Reestructure grub-pc.postinst. Notably: + - Do not touch menu.lst unless user has confirmed it (via debconf). + (Closes: #459247) + - When we do, keep a backup in /boot/grub/menu.lst_backup_by_grub2_postinst. + + -- Robert Millan Sat, 5 Jan 2008 17:55:37 +0100 + +grub2 (1.95+20080101-1) unstable; urgency=low + + * New CVS snapshot. + - patches/disable_xfs.diff: Rewrite in a way that won't collide with + upstream changes so often. + - unifont.hex now processed by upstream. + - rules: Disable build of unifont.pff. + - *.install: Remove build/unifont.pff line. + - patches/menu_color.diff: Change menu color to our traditional blue theme. + * Support new dpkg fields (Homepage, Vcs-Svn, Vcs-Browser). + * patches/disable_ata.diff: Prevent ATA module from being built on i386-pc. + + -- Robert Millan Tue, 1 Jan 2008 19:45:30 +0100 + +grub2 (1.95+20071101-1) unstable; urgency=low + + * New CVS snapshot. + - patches/linuxbios.diff: Remove (supported in upstream now). + + -- Robert Millan Thu, 1 Nov 2007 13:18:51 +0100 + +grub2 (1.95+20071004-2) unstable; urgency=low + + * Rename debian/grub-of.* to debian/grub-ieee1275.*. + * Add debian/grub-linuxbios.{postinst,dirs,install}. + * rules: Fix/Overrride lintian warnings (unstripped-binary-or-object). + * Remove grub-linuxbios.postinst. + + -- Robert Millan Wed, 10 Oct 2007 23:56:35 +0200 + +grub2 (1.95+20071004-1) unstable; urgency=low + + * New CVS snapshot. + * Add grub-linuxbios package. + - patches/linuxbios.diff + - control + - rules + * Rename grub-of to grub-ieee1275 to match with upstream conventions. + - control + - rules + + -- Robert Millan Thu, 4 Oct 2007 14:42:30 +0200 + +grub2 (1.95+20070829-1) unstable; urgency=low + + * New CVS snapshot. + - Includes fix for parallel builds. + * rules: Append -j flag to $(MAKE) to take advantage of >1 processors. + * Add reference to /usr/share/common-licenses. + - debian/copyright + - debian/control (all packages): Add base-files (>= 4.0.1) dependency. + + -- Robert Millan Sat, 1 Sep 2007 19:00:22 +0200 + +grub2 (1.95+20070828-2) unstable; urgency=low + + * control (grub-of): Make depends on powerpc-ibm-utils versioned as + >= 1.0.6 (older versions don't have -a flag). + + -- Robert Millan Tue, 28 Aug 2007 23:32:32 +0200 + +grub2 (1.95+20070828-1) unstable; urgency=low + + * New CVS snapshot. + - Adds ntfs support. + - Fixes a pair of issues indirectly breaking grub-probe on powerpc. + (Closes: #431488) + - patches/disable_xfs.diff: Resync. + - copyright: License upgraded to GPLv3. + * control (grub-of Depends): Add powerpc-utils (for nvsetenv) and bc. + + -- Robert Millan Tue, 28 Aug 2007 21:24:14 +0200 + +grub2 (1.95+20070626-1) unstable; urgency=low + + * New CVS snapshot. + - More fixes to cope with unreadable /. (Closes: #427289) + - update-grub supports multiple terminals. + * control (Build-Depends): Add genisoimage. + * patches/partmap_fallback.diff: Remove. It didn't archieve anything as + it also needs support for proper identification of raid / lvm (this is + being worked on). + * patches/disable_xfs.diff: Disable xfs in grub-probe. + * grub-rescue-pc.README.Debian: New. Explain how to use the rescue + images. + + -- Robert Millan Tue, 26 Jun 2007 08:39:14 +0200 + +grub2 (1.95+20070614-1) unstable; urgency=low + + * New CVS snapshot. + - update-grub is tollerant to unreadable / (as long as /boot is + accessible). (Closes: #427289) + * grub-pc.postinst: Generate new grub.cfg when menu.lst exists. + * New package grub-rescue-pc. + - control: Add it. + - README.Debian.in: Remove obsolete documentation. + - rules: Build rescue images using grub-mkrescue. + - grub-rescue-pc.dirs: Prepare their directory. + - grub-rescue-pc.install: Install them. + * legacy/update-grub: Fix core.img detection on separate /boot. + + -- Robert Millan Thu, 14 Jun 2007 08:17:21 +0200 + +grub2 (1.95+20070604-1) unstable; urgency=low + + * New CVS snapshot. + - patches/grub_probe_for_everyone.diff: Remove (merged). + - update-grub exports user-defined GRUB_CMDLINE_LINUX. (Closes: #425453) + - Fix those nasty powerpc bugs. (Closes: #422729) + + -- Robert Millan Mon, 4 Jun 2007 21:30:55 +0200 + +grub2 (1.95+20070520-1) unstable; urgency=low + + * New CVS snapshot. + - LVM / RAID fixes. (Closes: #423648, #381150) + - Fix memory management bug. (Closes: #423409) + - patches/efi.diff: Remove (merged). + - patches/grub_probe_for_everyone.diff: Use the new paths for + util/grub-probe.c, util/biosdisk.c, util/getroot.c. Enable + grub-mkdevicemap. (Closes: #424985) + * legacy/update-grub: Get rid of all grub-set-default calls. (Closes: #425054) + * grub-{pc,efi,of}.postinst: Only run update-grub if grub.cfg already exists. + * grub-pc.postinst: Only run GRUB Legacy compat stuff if menu.lst is found. + * patches/partmap_fallback.diff: New. Implement fallback "pc gpt" for partmap + detection failures. (Closes: #423022) + * control: Update XS-Vcs-* fields. Thanks Sam Morris . + (Closes: #425146) + * grub-{pc,efi,of}.{dirs,postinst}: Move unifont.pff to /usr/share/grub. + + -- Robert Millan Sun, 20 May 2007 11:13:03 +0200 + +grub2 (1.95+20070515-1) unstable; urgency=low + + * New CVS snapshot. + - Fix assumptions about /, /boot and /boot/grub being the same device. + (Closes: #423268, #422459) + - Proper sorting of Linux images. (Closes: #422580) + - update-grub lets /etc/default/grub override its variables now. + (Closes: #423649) + - update-grub mentions /etc/default/grub in the grub.cfg header. + (Closes: #423651) + - update-grub sets 800x600x16 as the default gfxmode. (Closes: #422794) + - update-grub runs grub-mkdevicemap before attempting to use grub-probe + (part of #423217) + + [ Otavio Salvador ] + * Add support to DEB_BUILD_OPTIONS=noopt. Thanks to Sam Morris + for the patch. (Closes: #423005) + * Add Robert Millan as uploader. + * Change build-dependency from liblzo-dev to liblzo2-dev. (Closes: #423358) + + [ Robert Millan ] + * grub-pc.postinst: + - Remove /boot/grub/device.map before running grub-install. + (Closes: #422851) + - Always run update-grub after grub-install. (part of #423217) + - Use grub-mkdevicemap instead of removing device.map, since update-grub + needs it but grub-install is not run unconditionaly. + - Redirect grub-install invocation to /dev/null, since it can mislead + users into thinking that MBR was overwritten. (part of #423217) + * default/grub: Stop exporting the variables (update-grub does that now). + * Misc EFI fixes, including new grub-install. + - patches/efi.diff: New. + - patches/grub_probe_for_everyone.diff: Move some bits to efi.diff. + - grub-efi.install: Stop installing dummy grub-install. + - grub-install: Remove. + * grub-pc.postinst: Avoid generating core.img when menu.lst is not present, + to avoid duplicated work (this is specialy important for d-i). (part of + #423217). + * See multiple references above. (Closes: #423217) + * grub-{pc,efi,of}.{dirs,install}: Install presubj in the right directory + to make it work again (oops). + * Add reportbug script to gather debugging information. (Closes: #423218) + - script: New. + - grub-{pc,efi,of}.install: Install it. + * Install the reportbug scripts for grub2 too, since users might still use + it for bugfiling. + - grub2.dirs + - grub2.install + * Fix some lintian warnings. + - control (grub2): Depend on debconf. + - README.Debian.in: Fix mispell. + - grub2.templates: Remove extra dot. + + -- Robert Millan Tue, 15 May 2007 22:08:53 +0200 + +grub2 (1.95+20070507-1) unstable; urgency=low + + [ Robert Millan ] + * New CVS snapshot. + - patches/build_neq_src.diff: Remove (merged). + * Fix debhelper files to ensure each package gets the right thing. + * Enable gfxterm/unifont support. + * On grub-pc, if there's no core.img setup, create one (but do not + risk writing to MBR). + * On grub-pc, if menu.lst is found, regenerate it to include our + core.img. + + [ Otavio Salvador ] + * Move debian/update-grub to debian/legacy/update-grub otherwise the + source gets messy. + + -- Otavio Salvador Mon, 07 May 2007 18:48:14 -0300 + +grub2 (1.95+20070505.1-3) unstable; urgency=low + + * Split postinst into grub2.postinst (with the transition warning) and + postinst.in, with update-grub invocation for grub-{pc,efi,of}. + - postinst.in + - grub2.postinst + - rules + + -- Robert Millan Sun, 6 May 2007 01:20:04 +0200 + +grub2 (1.95+20070505.1-2) unstable; urgency=low + + * Add EFI build of GRUB. + - control: Restructure to provide 3 packages: grub-pc (x86), + grub-efi (x86) and grub-of (powerpc). + - rules: Handle a separate build for each package. + - patches/build_neq_src.diff: Fix builddir == srcdir assumptions. + - patches/grub_probe_for_everyone.diff: New (superceds + powerpc_probe.diff). Enable grub-probe on powerpc and i386-efi. + - grub-install: Dummy informational grub-install for EFI. + - grub-efi.install: Installs it. + + -- Robert Millan Sun, 6 May 2007 00:23:56 +0200 + +grub2 (1.95+20070505.1-1) unstable; urgency=low + + * New CVS snapshot. + * patches/powerpc_probe.diff: Add partmap/gpt.c to grub-probe. + * control (Architecture): Temporarily disable powerpc. Sorry, but runtime + is currently broken and we don't have the hardware to debug it. Will be + re-enabled in next upload. + + -- Robert Millan Sat, 5 May 2007 21:52:49 +0200 + +grub2 (1.95+20070505-1) unstable; urgency=low + + * New CVS snapshot. + - Improved grub.cfg parser. (Closes: #381215) + - patches/fix-grub-install.diff: Remove (merged). + - control (Build-Depends): Remove libncurses5-dev (no longer needed). + - provides update-grub2. (Closes: #419151) + - Supports GPT in PC/BIOS systems. (Closes: #409073) + * control (Build-Depends): Add gcc-multilib to fix FTBFS. + * control (Description): Make it less scary, and more informative. + * postinst: Run update-grub to ensure the latest improvements always are + applied. + * patches/powerpc_probe.diff: Attempt at making grub-probe build/install + on powerpc (and hopefuly update-grub). + + -- Robert Millan Sat, 5 May 2007 01:49:07 +0200 + +grub2 (1.95-5) unstable; urgency=low + + * Fix FTBFS on kFreeBSD. Thanks to Aurelien Jarno + by providing the patch. Closes: #416408 + + -- Otavio Salvador Fri, 30 Mar 2007 19:20:48 -0300 + +grub2 (1.95-4) unstable; urgency=low + + * Fix powerpc grub-install binary path. Closes: #402838 + + -- Otavio Salvador Thu, 22 Mar 2007 23:45:56 -0300 + +grub2 (1.95-3) unstable; urgency=low + + [ Christian Perrier ] + * Switch to po-debconf for debconf templates. Closes: #402972 + * Depend on ${misc:Depends} and not "debconf" to allow cdebconf to be used + * Debconf translations: + - French + - Czech. Closes: #413327 + - Galician. Closes: #413323 + - Swedish. Closes: #413325 + - Portuguese. Closes: #413332 + - German. Closes: #413365 + - Tamil. Closes: #413478 + - Russian. Closes: #413542 + - Italian. Closes: #413904 + - Romanian. Closes: #414443 + + -- Otavio Salvador Tue, 20 Mar 2007 23:46:38 -0300 + +grub2 (1.95-2) unstable; urgency=low + + [ Robert Millan ] + * update-grub: Fix for Xen hypervisor entries, thanks Aaron Schrab. + (Closes: #394706) + * Transition to new numbering scheme for partitions. (Closes: #395019) + - update-grub: Don't substract 1 when converting partition device names to + grub drives. + - Add debconf warning explaining the situation. + * Rewrite Architecture line back to hardcoded list :(. (Closes: #398060) + + -- Otavio Salvador Mon, 11 Dec 2006 05:08:41 -0200 + +grub2 (1.95-1) unstable; urgency=low + + * New upstream release. + - patches/03_revert_partition_numbering.diff: Delete (obsoleted). + + -- Robert Millan Sat, 14 Oct 2006 21:19:21 +0200 + +grub2 (1.94+20061003-1) unstable; urgency=high + + * New CVS snapshot. + + [ Otavio Salvador ] + * Change debhelper compatibility mode to 5: + - debian/compat: setted to 5; + * control (Build-Depends): Add lib32ncurses5-dev for ppc64. + Closes: #389873 + * Set urgency=high since it's experimental stuff and tagged likewise. It + also solved a serious bug on PowerPC that leave users with a black + screen. + + [ Robert Millan ] + * control (Depends): Add powerpc-ibm-utils for powerpc/ppc64. + (Closes: #372186) + + -- Otavio Salvador Tue, 3 Oct 2006 16:49:32 -0300 + +grub2 (1.94+20060926-1) unstable; urgency=high + + * New CVS snapshot. + - Command-line editting fix (Closes: #381214). + - Fixes runtime breakage on amd64 (not in BTS). + - Delete a few patches (merged). + + [ Robert Millan ] + * Set urgency=high. Might seem like a rush, but it can't possibly be worse than + 1.94-5 (broken on systems that use udev, broken on amd64...). + * Pure ppc64 support. + - control (Architecture): Add any-ppc64. + - control (Build-Depends): Add libc6-dev-powerpc [ppc64]. + * rules: Remove moddep.lst install command (no longer needed). + * patches/03_revert_partition_numbering.diff: New. Revert a commit that + broke grub-probefs. + * Add bug template to encourage sending upstream stuff directly to + upstream. + - presubj: New. + + [ Otavio Salvador ] + * Add XS-X-Vcs-Svn on control file and point it to our current svn + repository. + * Add cvs-snapshot to rules. + + -- Otavio Salvador Tue, 26 Sep 2006 16:14:36 -0300 + +grub2 (1.94-6) unstable; urgency=low + + [ Robert Millan ] + * update-grub: Set interpreter to /bin/bash to cope with non-POSIX + extensions. (mentioned in #361929) + * patches/03_avoid_recursing_into_dot_static.diff: New. Avoid recursing into + dotdirs (e.g. ".static"). + * patches/04_mkdevicemap_dont_assume_floppies.diff: New. Don't assume + /dev/fd0 exists when generating device.map. + + -- Otavio Salvador Thu, 14 Sep 2006 16:07:30 -0300 + +grub2 (1.94-5) unstable; urgency=low + + [ Robert Millan ] + * control (Build-Depends): s/any-amd64/amd64 kfreebsd-amd64/g (this seems to + confuse buildds). + * 02_not_remove_menu_lst.patch: New patch. Skip menu.lst removal in + grub-install. (Closes: #372934) + + -- Otavio Salvador Sun, 20 Aug 2006 12:02:13 -0300 + +grub2 (1.94-4) unstable; urgency=low + + [ Otavio Salvador ] + * 01_fix_amd64_building.patch: dropped since it now supports amd64 + native building. + * Remove convert_kernel26 usage since it's not necessary anymore and due + initramfs-tools changes it's bug too. + + [ Robert Millan ] + * Fork update-grub from grub legacy, and tweak a few commands in output to + make it work for grub2. + * Update README.Debian.in with more recent (and easier) install instructions. + * Add grub to Conflicts/Replaces. Too many commands with the same name, + even if they don't use the same path yet (but will likely do in the + future, see #361929). + * Get rid of control.in, which I introduced in 0.6+20040805-1 and turned out + to be an endless source of problems (and forbidden by policy as well). + * Fix FTBFS on amd64. Really closes: #372548. + + -- Otavio Salvador Fri, 18 Aug 2006 15:38:25 -0300 + +grub2 (1.94-3) unstable; urgency=low + + * Fix FTBFS in amd64. Closes: 372548 + + -- Otavio Salvador Sat, 10 Jun 2006 19:57:01 -0300 + +grub2 (1.94-2) unstable; urgency=low + + * Update grub images paths in README.Debian + * 01_fix_grub-install.patch: add to fix a problem with PowerPC + installation. Refs: #371069 + * Fix FTBFS in amd64. Closes: #370803 + + -- Otavio Salvador Fri, 9 Jun 2006 09:29:40 -0300 + +grub2 (1.94-1) unstable; urgency=low + + * New upstream release. + - Fix powerpc building. Closes: #370259 + - 01_fix_grub-install.patch: merged upstream. + - Moved modules to /usr/lib/grub since they are architecture + dependent. + * Leave CDBS set debhelper compatibility level. + * Allow amd64 build to happen. Closes: #364956 + * Enforce building in 32bits while running in x86_64 machines. + * Update Standards version to 3.7.2. No changes need. + + -- Otavio Salvador Mon, 5 Jun 2006 12:49:09 -0300 + +grub2 (1.93-1) unstable; urgency=low + + * New upstream release. + - Added support to PowerPC. Closes: #357853 + - 01_fix_grub-install.patch: rediff. + * Update Standards version to 3.6.2. No changes need. + * Start to use new dpkg architecture definition. Closes: #360134 + + -- Otavio Salvador Sat, 1 Apr 2006 10:07:17 -0300 + +grub2 (1.92-2) unstable; urgency=low + + * Add bison on build-depends field. Closes: #346178 + * Add more fixes in 01_fix_grub-install.patch. Closes: #346177 + + -- Otavio Salvador Fri, 6 Jan 2006 09:48:08 -0200 + +grub2 (1.92-1) unstable; urgency=low + + * New upstream release. + - Add support for GPT partition table format. + - Add a new command "play" to play an audio file on PC. + - Add support for Linux/ADFS partition table format. + - Add support for BASH-like scripting. + - Add support for Apple HFS+ filesystems. + * 01_fix_grub-install.patch: Added. Fix grub-install to use + /bin/grub-mkimage instead of /sbin/grub-mkimage. Closes: #338824 + * Do not use CDBS tarball mode anymore. Closes: #344272 + + -- Otavio Salvador Thu, 5 Jan 2006 15:20:40 -0200 + +grub2 (1.91-0) unstable; urgency=low + + * New upstream release. Closes: #331211 + * debian/watch: added. + * debian/control.in, debian/control: Add libncurses5-dev in + Build-Depends. Closes: #304638 + * Remove Robert Millan as uploader; + * Add myself as uploader; + + -- Otavio Salvador Sat, 12 Nov 2005 16:35:18 -0200 + +grub2 (0.6+20050203-2) unstable; urgency=low + + * Disable for powerpc. Reportedly it fails to boot. + + -- Robert Millan Fri, 4 Feb 2005 01:52:09 +0100 + +grub2 (0.6+20050203-1) unstable; urgency=low + + * New upstream snapshot. + * Install moddep.lst properly in a cpu-independant way. (Closes: #264115) + * Use cdbs debian/control autogeneration. + - Set DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes. + - Move control to control.in. + - Add a @cdbs@ tag and replace Architecture with Cpu/System. + * control.in (Build-Depends): Add ruby. + + -- Robert Millan Thu, 3 Feb 2005 22:33:39 +0100 + +grub2 (0.6+20040805-1) unstable; urgency=low + + * New upstream snapshot. + * Uploading to unstable so that powerpc users can be blessed by GRUB too. + * Use type-handling to generate dpkg arch list. + - control.in + - rules + + -- Robert Millan Thu, 5 Aug 2004 20:50:16 +0200 + +grub2 (0.6+20040502-1) experimental; urgency=low + + * New upstream snapshot. + - Fix FTBFS on powerpc. + + -- Robert Millan Sun, 2 May 2004 18:16:29 +0200 + +grub2 (0.6+20040429-1) experimental; urgency=low + + * New upstream snapshot. + - control (Architecture): Add powerpc. + + -- Robert Millan Thu, 29 Apr 2004 20:41:31 +0200 + +grub2 (0.6+20031125-1) experimental; urgency=low + + * New upstream snapshot. + - patches/multiboot.diff: Nuked. + - install,docs: Update directory name. + * control (Maintainer): Set to pkg-grub-devel mailing list. + * control (Uploaders): Add myself. + * control (Architecture): Add freebsd-i386 and netbsd-i386. + + -- Robert Millan Tue, 25 Nov 2003 23:48:18 +0100 + +grub2 (0.6+20031114-1) experimental; urgency=low + + * New upstream snapshot. + - README.Debian: s/fat/ext2/g (We now have ext2fs support). + * Add multiboot support, thanks to Jeroen Dekkers for his patch. + - patches/multiboot.diff: New. + - control (Architecture): Add hurd-i386 (which needed multiboot). + * Rename package to grub2 (to follow upstream tendency). + - control: Ditto. + - README.Debian: Likewise. + * Switch to tarball mode. + - rules: Ditto. + - docs: Prefix paths in order to workaround dh_installdocs bug. + - install: Likewise, but not because of bug (should be in rules, actualy). + * Fix FTBFS. (Closes: #213868) + - control (Build-Depends): Add autoconf. + - control (Build-Conflicts): Add autoconf2.13. + + -- Robert Millan Fri, 14 Nov 2003 13:16:12 +0100 + +pupa (0.6+20031008-1) experimental; urgency=low + + * New upstream snapshot. + * Uploading to experimental. + * debian/control: Add Jason Thomas to Uploaders. + + -- Robert Millan Wed, 8 Oct 2003 13:22:50 +0000 + +pupa (0.6+20030915-1) unstable; urgency=low + + * Initial Release. (Closes: #211030) + + -- Robert Millan Mon, 15 Sep 2003 14:58:42 +0000 --- grub2-1.96+20080724.orig/debian/grub-rescue-pc.install +++ grub2-1.96+20080724/debian/grub-rescue-pc.install @@ -0,0 +1,2 @@ +build/grub-rescue-pc/grub-rescue-floppy.img usr/lib/grub-rescue +build/grub-rescue-pc/grub-rescue-cdrom.iso usr/lib/grub-rescue --- grub2-1.96+20080724.orig/debian/grub-ieee1275.install +++ grub2-1.96+20080724/debian/grub-ieee1275.install @@ -0,0 +1,5 @@ +debian/presubj usr/share/bug/grub-ieee1275 +debian/script usr/share/bug/grub-ieee1275 +debian/default etc +debian/grub.d etc +debian/update-grub2 usr/sbin --- grub2-1.96+20080724.orig/debian/docs.in +++ grub2-1.96+20080724/debian/docs.in @@ -0,0 +1,3 @@ +build-tree/*/NEWS +build-tree/*/README +build-tree/*/TODO --- grub2-1.96+20080724.orig/debian/grub-pc.config +++ grub2-1.96+20080724/debian/grub-pc.config @@ -0,0 +1,24 @@ +#!/bin/bash -e + +if test -e /boot/grub/menu.lst ; then + . /usr/share/debconf/confmodule + + db_input high grub-pc/chainload_from_menu.lst || true + + db_get grub-pc/linux_cmdline + # this check ensures we only do this once + if [ "$RET" = "fillme" ] ; then + kopt=`sed -ne "s/^# kopt=//p" /boot/grub/menu.lst | tr -s " " "\n" | grep -vx "\(ro\|root=[^ ]*\)"` || true + db_set grub-pc/linux_cmdline "${kopt}" || true + if [ "${kopt}" == "" ] ; then + # something smells bad. give user a chance to correct it. + priority=high + else + # if we got something from menu.lst, it must be correct? + priority=medium + fi + db_input ${priority} grub-pc/linux_cmdline || true + fi + + db_go +fi --- grub2-1.96+20080724.orig/debian/grub-rescue-pc.dirs +++ grub2-1.96+20080724/debian/grub-rescue-pc.dirs @@ -0,0 +1 @@ +usr/lib/grub-rescue --- grub2-1.96+20080724.orig/debian/grub-linuxbios.dirs +++ grub2-1.96+20080724/debian/grub-linuxbios.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/sbin +usr/share/grub +usr/share/bug/grub-linuxbios --- grub2-1.96+20080724.orig/debian/grub-rescue-pc.README.Debian +++ grub2-1.96+20080724/debian/grub-rescue-pc.README.Debian @@ -0,0 +1,16 @@ +grub-rescue-pc +~~~~~~~~~~~~~~ + +How to test the images with qemu: + + qemu -fda /usr/lib/grub-rescue/grub-rescue-floppy.img + + qemu -cdrom /usr/lib/grub-rescue/grub-rescue-cdrom.iso + +How to write the images to bootable media: + + sudo dd if=/usr/lib/grub-rescue/grub-rescue-floppy.img of=/dev/fd0 bs=32k + + sudo wodim /usr/lib/grub-rescue/grub-rescue-cdrom.iso + # or just use your favourite CD burning program + --- grub2-1.96+20080724.orig/debian/grub2.dirs +++ grub2-1.96+20080724/debian/grub2.dirs @@ -0,0 +1 @@ +usr/share/bug/grub2 --- grub2-1.96+20080724.orig/debian/grub-ieee1275.postinst +++ grub2-1.96+20080724/debian/grub-ieee1275.postinst @@ -0,0 +1,22 @@ +#!/bin/sh -e + +case "$1" in + configure) + if test -e /boot/grub/grub.cfg ; then + update-grub + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- grub2-1.96+20080724.orig/debian/grub-efi.dirs +++ grub2-1.96+20080724/debian/grub-efi.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/sbin +usr/share/grub +usr/share/bug/grub-efi --- grub2-1.96+20080724.orig/debian/update-grub2 +++ grub2-1.96+20080724/debian/update-grub2 @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec update-grub --- grub2-1.96+20080724.orig/debian/grub-common.install +++ grub2-1.96+20080724/debian/grub-common.install @@ -0,0 +1,2 @@ +build/grub-common/grub-probe usr/sbin +build/grub-common/grub-mkdevicemap usr/sbin --- grub2-1.96+20080724.orig/debian/grub-ieee1275.dirs +++ grub2-1.96+20080724/debian/grub-ieee1275.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/sbin +usr/share/grub +usr/share/bug/grub-ieee1275 --- grub2-1.96+20080724.orig/debian/grub.d/05_debian_theme +++ grub2-1.96+20080724/debian/grub.d/05_debian_theme @@ -0,0 +1,51 @@ +#!/bin/bash -e + +source /usr/lib/grub/update-grub_lib + +set_blue_theme() +{ + cat << EOF +set menu_color_normal=cyan/blue +set menu_color_highlight=white/blue +EOF +} + +# check for usable backgrounds +use_bg=false +if [ "$GRUB_TERMINAL" = "gfxterm" ] ; then + for i in {/boot/grub,/usr/share/images/desktop-base}/moreblue-orbit-grub.{png,tga} ; do + if is_path_readable_by_grub $i ; then + bg=$i + case ${bg} in + *.png) reader=png ;; + *.tga) reader=tga ;; + *.jpg|*.jpeg) reader=jpeg ;; + esac + if test -e /boot/grub/${reader}.mod ; then + echo "Found Debian background: `basename ${bg}`" >&2 + use_bg=true + break + fi + fi + done +fi + +# set the background if possible +if ${use_bg} ; then + prepare_grub_to_access_device `${grub_probe} --target=device ${bg}` + cat << EOF +insmod ${reader} +if background_image `make_system_path_relative_to_its_root ${bg}` ; then + set color_normal=black/black + set color_highlight=magenta/black +else +EOF +fi + +# otherwise, set the traditional Debian blue theme +if ${use_bg} ; then + set_blue_theme | sed -e "s/^/ /g" + echo "fi" +else + set_blue_theme +fi --- grub2-1.96+20080724.orig/debian/legacy/grub-set-default +++ grub2-1.96+20080724/debian/legacy/grub-set-default @@ -0,0 +1,141 @@ +#! /bin/sh + +# Set a default boot entry for GRUB +# Copyright (C) 2004 Free Software Foundation, Inc. +# +# This file 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Initialize some variables. +PACKAGE=grub +VERSION=0.97 + +rootdir= +entry= + +# Usage: usage +# Print the usage. +usage () { + cat <. +EOF +} + +# Check the arguments. +for option in "$@"; do + case "$option" in + -h | --help) + usage + exit 0 ;; + -v | --version) + echo "grub-set-default (GNU GRUB ${VERSION})" + exit 0 ;; + --root-directory=*) + rootdir=`echo "$option" | sed 's/--root-directory=//'` ;; + -*) + echo "Unrecognized option \`$option'" 1>&2 + usage + exit 1 + ;; + *) + if test "x$entry" != x; then + echo "More than one entries?" 1>&2 + usage + exit 1 + fi + # We don't care about what the user specified actually. + entry="${option}" ;; + esac +done + +if test "x$entry" = x; then + echo "entry not specified." 1>&2 + usage + exit 1 +fi + +find_grub_dir () +{ + echo -n "Searching for GRUB installation directory ... " >&2 + + for d in $grub_dirs ; do + if [ -d "$d" ] ; then + grub_dir="$d" + break + fi + done + + if [ -z "$grub_dir" ] ; then + abort "No GRUB directory found.\n###" + else + echo "found: $grub_dir" >&2 + fi + + echo $grub_dir +} + +grub_dirs="/boot/grub /boot/boot/grub" + +# Determine the GRUB directory. This is different among OSes. +# if rootdir has been informed use it or find grubdir otherwise +if [ -n "${rootdir}" ]; then + grubdir=${rootdir}/boot/grub + if test -d ${grubdir}; then + : + else + grubdir=${rootdir}/grub + if test -d ${grubdir}; then + : + else + echo "No GRUB directory found under ${rootdir}/" 1>&2 + exit 1 + fi + fi +else + grubdir=$(find_grub_dir) +fi + +file=${grubdir}/default +if test -f ${file}; then + chmod 0600 ${file} + rm -f ${file} +fi +cat < $file +$entry +# +# +# +# +# +# +# +# +# +# +# WARNING: If you want to edit this file directly, do not remove any line +# from this file, including this warning. Using \`grub-set-default\' is +# strongly recommended. +EOF + +# Bye. +exit 0 --- grub2-1.96+20080724.orig/debian/legacy/update-grub +++ grub2-1.96+20080724/debian/legacy/update-grub @@ -0,0 +1,1081 @@ +#!/bin/bash +# +# Insert a list of installed kernels in a grub config file +# Copyright 2001 Wichert Akkerman +# Copyright (C) 2007,2008 Free Software Foundation, Inc. +# +# This file 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 GRUB. If not, see . +# +# Contributors: +# Jason Thomas +# David B.Harris +# Marc Haber +# Crispin Flowerday + +# Abort on errors +set -e + +host_os=`uname -s | tr '[A-Z]' '[a-z]'` + +abort() { + message=$@ + + echo >&2 + echo -e "$message" >&2 + echo >&2 + exit 1 +} + +find_grub_dir () +{ + echo -n "Searching for GRUB installation directory ... " >&2 + + for d in /boot/grub /boot/boot/grub ; do + if [ -d "$d" ] ; then + grub_dir="$d" + break + fi + done + + if [ -z "$grub_dir" ] ; then + abort "No GRUB directory found.\n To create a template run 'mkdir /boot/grub' first.\n To install grub, install it manually or try the 'grub-install' command.\n ### Warning, grub-install is used to change your MBR. ###" + else + echo "found: $grub_dir" >&2 + fi + + echo $grub_dir +} + +# This function was borrowed from grub2/util/update-grub_lib.in +make_system_path_relative_to_its_root () +{ + path=$1 + # abort if file doesn't exist + if test -e $path ; then : ;else + return 1 + fi + + # canonicalize + if path=`readlink -f $path` ; then : ; else + return 1 + fi + + # if not a directory, climb up to the directory containing it + if test -d $path ; then + dir=$path + else + dir=`echo $path | sed -e "s,/[^/]*$,,g"` + fi + + num=`stat -c %d $dir` + + # this loop sets $dir to the root directory of the filesystem we're inspecting + while : ; do + parent=`readlink -f $dir/..` + if [ "x`stat -c %d $parent`" = "x$num" ] ; then : ; else + # $parent is another filesystem; we found it. + break + fi + if [ "x$dir" = "x/" ] ; then + # / is our root. + break + fi + dir=$parent + done + + # This function never prints trailing slashes (so that its output can be + # appended a slash unconditionally). Each slash in $dir is considered a + # preceding slash, and therefore the root directory is an empty string. + if [ "$dir" = "/" ] ; then + dir="" + fi + + echo $path | sed -e "s,^$dir,,g" +} + +# The grub installation directory +grub_dir=$(find_grub_dir) + +# Full path to the device.map +device_map=$grub_dir/device.map + +find_device () +{ + if ! test -e ${device_map} ; then + echo quit | grub --batch --no-floppy --device-map=${device_map} > /dev/null + fi + grub-probe --device-map=${device_map} -t device $1 2> /dev/null +} + +# Usage: convert_raid1 os_device +# Checks if os_device is a software raid1. +# If so, converts to first physical device in array. +convert_raid1 () +{ + case $1 in + /dev/md[0-9] | /dev/md/[0-9]) + : ;; # Continue + *) + return 1 ;; + esac + + [ -x /sbin/mdadm ] || return 1 + + # Check that the raid device is raid1 + raidlevel=$(mdadm -D -b $1 | grep "^ARRAY" | \ + sed "s/^.*level=//" | cut -d" " -f1) + [ "$raidlevel" = "raid1" ] || return 1 + + # Take only the first device that makes up the raid + raiddev=$(mdadm -D $1 | grep -A1 "Number" | grep "dev" \ + | sed "s/^.*\(\/dev\/.*\)$/\1/") + [ -n "$raiddev" ] || return 1 + + echo $raiddev + return 0 +} + +# Usage: convert os_device +# Convert an OS device to the corresponding GRUB drive. +convert () { + if ! test -e ${device_map} ; then + echo quit | grub --batch --no-floppy --device-map=${device_map} > /dev/null + fi + GRUB_LEGACY_0_BASED_PARTITIONS=1 grub-probe --device-map=${device_map} -t drive -d "$1" 2> /dev/null || { + echo "warning: grub-probe can't find drive for $1." >&2 + tmp_map=$(mktemp -t device.map.XXXXXXXX) + grub-mkdevicemap --device-map=${tmp_map} --no-floppy >/dev/null 2>&1 || true + GRUB_LEGACY_0_BASED_PARTITIONS=1 grub-probe --device-map=${tmp_map} -t drive -d "$1" || { + rm -f ${tmp_map} + return 1 + } + echo "Please check ${device_map}, you might have to regenerate it with grub-mkdevicemap." >&2 + rm -f ${tmp_map} + } +} + +# Usage: convert_default os_device +# Convert an OS device to the corresponding GRUB drive. +convert_default () { + # Check if device is software raid1 array + if tmp_dev=$(convert_raid1 $1 2>/dev/null) ; then + : # Use device returned by convert_raid1 + else + tmp_dev=$1 + fi + + convert $tmp_dev +} + +## Configuration Options + +# Full path to the menu.lst +menu_file_basename=menu.lst +menu_file=$grub_dir/$menu_file_basename + +# Full path to the default file +default_file_basename=default +default_file=$grub_dir/$default_file_basename + +# the device for the / filesystem +root_device=$(find_device "/") + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${root_device} in + /dev/loop/*|/dev/loop[0-9]) + root_device=`losetup ${root_device} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` + ;; +esac + +# the device for the /boot filesystem +boot_device=$(find_device "/boot") + +# where grub looks for the kernels at boot time +kernel_dir=`make_system_path_relative_to_its_root /boot` + +# the "-t abstraction" check is a workaround untill #484297 is fixed +if abstraction=`grub-probe -t abstraction --device ${root_device} 2> /dev/null` && [ "$abstraction" = "" ] && \ + root_uuid=`grub-probe --device-map=${device_map} --device ${root_device} --target=fs_uuid 2> /dev/null` && \ + test -e "/dev/disk/by-uuid/${root_uuid}" ; then + linux_root_device=UUID=${root_uuid} +else + linux_root_device=${root_device} +fi + +# Default kernel options, overidden by the kopt statement in the menufile. +kopt="root=$linux_root_device ro" + +# Title +title="Debian GNU/`uname -s | sed -e s,GNU/,,g`" + +# should update-grub remember the default entry +updatedefaultentry="false" + +# Drive(in GRUB terms) where the kernel is located. Overridden by the +# kopt statement in menufile. +grub_root_device=$(convert_default "$boot_device") + +# should grub create the alternative boot options in the menu + alternative="true" + +# should grub lock the alternative boot options in the menu + lockalternative="false" + +# additional options to use with the default boot option, but not with the +# alternatives + defoptions="" + +# should grub lock the old kernels + lockold="false" + +# Xen hypervisor options to use with the default Xen boot option + xenhopt="" + +# Xen Linux kernel options to use with the default Xen boot option + xenkopt="console=tty0" + +# options to use with the alternative boot options + altoptions="(single-user mode) single" + +# controls howmany kernels are listed in the config file, +# this does not include the alternative kernels + howmany="all" + +# should grub create a memtest86 entry + memtest86="true" + +# should grub add "savedefault" to default boot options + savedefault="false" + +# stores the command line arguments + command_line_arguments=$1 + +# read user configuration +if test -f "/etc/default/grub" ; then + . /etc/default/grub +fi + +# Default options to use in a new config file. This will only be used if $menu_file +# doesn't already exist. Only edit the lines between the two "EOF"s. The others are +# part of the script. +newtemplate=$(tempfile) +cat > "$newtemplate" <&2 +if [ -f "$default_file" ] ; then + echo "found: $default_file" >&2 +else + echo "Generating $default_file file and setting the default boot entry to 0" >&2 + grub-set-default 0 +fi + +# Make sure we use the standard sorting order +LC_COLLATE=C +# Magic markers we use +start="### BEGIN AUTOMAGIC KERNELS LIST" +end="### END DEBIAN AUTOMAGIC KERNELS LIST" + +startopt="## ## Start Default Options ##" +endopt="## ## End Default Options ##" + +# Extract options from config file +ExtractMenuOpt() +{ + opt=$1 + + sed -ne "/^$start\$/,/^$end\$/ { + /^$startopt\$/,/^$endopt\$/ { + /^# $opt=/ { + s/^# $opt=\(.*\)\$/\1/ + p + } + } + }" $menu +} + +GetMenuOpts() +{ + opt=$1 + + sed -ne "/^$start\$/,/^$end\$/ { + /^$startopt\$/,/^$endopt\$/ { + /^# $opt=/ { + p + } + } + }" $menu +} + +ExtractMenuOpts() +{ + opt=$1 + + GetMenuOpts $opt | sed "s/^# $opt=\(.*\)\$/\1=\"\2\"/" +} + +GetMenuOpt() +{ + opt=$1 + value=$2 + + [ -z "$(GetMenuOpts "$opt")" ] || value=$(ExtractMenuOpt "$opt") + + echo $value +} + +# Compares two version strings A and B +# Returns -1 if AB +# This compares version numbers of the form +# 2.4.14.2 > 2.4.14 +# 2.4.14random = 2.4.14-random > 2.4.14-ac10 > 2.4.14 > 2.4.14-pre2 > +# 2.4.14-pre1 > 2.4.13-ac99 +CompareVersions() +{ + local a=`echo $1 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\)/~\1/g"` + local b=`echo $2 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\)/~\1/g"` + if [ "$a" = "$b" ] ; then + echo 0 + elif dpkg --compare-versions "$a" gt "$b" ; then + echo 1 + else + echo -1 + fi +} + +# looks in the directory specified for an initrd image with the version specified +FindInitrdName() +{ + # strip trailing slashes + directory=$(echo $1 | sed -e 's#/*$##') + version=$2 + + # initrd + # initrd.img + # initrd-lvm + # .*.gz + + initrdName="" + names="initrd initrd.img initrd-lvm" + compressed="gz" + + for n in $names ; do + # make sure we haven't already found it + if [ -z "$initrdName" ] ; then + if [ -f "$directory/$n$version" ] ; then + initrdName="$n$version" + break + else + for c in $compressed ; do + if [ -f "$directory/$n$version.$c" ] ; then + initrdName="$n$version.$c" + break + fi + done + fi + else + break + fi + done + + # return the result + echo $initrdName +} + +FindXenHypervisorVersions () +{ + version=$1 + + if [ -f "/var/lib/linux-image-$version/xen-versions" ]; then + ret="$(cat /var/lib/linux-image-$version/xen-versions)" + fi + + echo $ret +} + +get_kernel_opt() +{ + kernel_version=$1 + + version=$(echo $kernel_version | sed 's/^[^0-9]*//') + version=$(echo $version | sed 's/[-\+\.]/_/g') + if [ -n "$version" ] ; then + while [ -n "$version" ] ; do + currentOpt="$(eval "echo \${kopt_$version}")" + if [ -n "$currentOpt" ] ; then + break + fi + version=$(echo $version | sed 's/_\?[^_]*$//') + done + fi + + if [ -z "$currentOpt" ] ; then + currentOpt=$kopt + fi + + echo $currentOpt +} + +write_kernel_entry() +{ + local kernel_version; kernel_version=$1; shift + local recovery_desc; recovery_desc=$1; shift + local lock_alternative; lock_alternative=$1; shift + local grub_root_device; grub_root_device=$1; shift + local kernel; kernel=$1; shift + local kernel_options; kernel_options=$1; shift + local recovery_suffix; recovery_suffix=$1; shift + local initrd; initrd=$1; shift + local savedefault; savedefault=$1; shift + local lockold; lockold=$1; shift + local hypervisor + if [ -n "$1" ]; then + # Hypervisor. + hypervisor=$1; shift + local hypervisor_image; hypervisor_image=$1; shift + local hypervisor_version; hypervisor_version=$1; shift + local hypervisor_options; hypervisor_options=$1; shift + fi + + local grub_root_type + case "$grub_root_device" in + [^A-Za-z0-9]*) grub_root_type='root' ;; + *) grub_root_type='uuid' ;; + esac + + echo -n "title " >> $buffer + + if [ -n "$hypervisor" ]; then + echo -n "$hypervisor $hypervisor_version / " >> $buffer + fi + + echo -n "$title" >> $buffer + if [ -n "$kernel_version" ]; then + echo -n ", kernel $kernel_version" >> $buffer + fi + if [ -n "$recovery_desc" ]; then + echo -n " $recovery_desc" >> $buffer + fi + echo >> $buffer + + # lock the alternative options + if test x"$lock_alternative" = x"true" ; then + echo "lock" >> $buffer + fi + # lock the old entries + if test x"$lockold" = x"true" ; then + echo "lock" >> $buffer + fi + + echo "$grub_root_type $grub_root_device" >> $buffer + + echo -n "kernel " >> $buffer + if [ -n "$hypervisor" ]; then + echo -n "$hypervisor_image" >> $buffer + if [ -n "$hypervisor_options" ]; then + echo -n " $hypervisor_options" >> $buffer + fi + echo >> $buffer + echo -n "module " >> $buffer + fi + echo -n "$kernel" >> $buffer + if [ -n "$kernel_options" ]; then + echo -n " $kernel_options" >> $buffer + fi + if [ -n "$recovery_desc" ]; then + echo -n " $recovery_suffix" >> $buffer + fi + echo >> $buffer + + if [ -n "$initrd" ]; then + if [ -n "$hypervisor" ]; then + echo -n "module " >> $buffer + else + echo -n "initrd " >> $buffer + fi + echo "$initrd" >> $buffer + fi + + if test x"$savedefault" = x"true" ; then + echo "savedefault" >> $buffer + fi + echo >> $buffer +} + + +echo -n "Testing for an existing GRUB $menu_file_basename file ... " >&2 + +# Test if our menu file exists +if [ -f "$menu_file" ] ; then + menu="$menu_file" + rm -f $newtemplate + unset newtemplate + echo "found: $menu_file" >&2 + cp -f "$menu_file" "$menu_file~" +else + # if not ask user if they want us to create one + menu="$menu_file" + echo >&2 + echo >&2 + if [ "-y" = "$command_line_arguments" ] ; then + echo "Warning: ignoring deprecated -y option." >&2 + fi + echo >&2 + echo "Generating $menu_file" >&2 + cat "$newtemplate" > $menu_file + rm -f $newtemplate + unset newtemplate +fi + +# Extract the kernel options to use +kopt=$(GetMenuOpt "kopt" "$kopt") + +# Set the kernel 2.6 option only for fresh install +test -z "$(GetMenuOpt "kopt" "")" && kopt_2_6="root=$linux_root_device ro" + +# Extract options for specific kernels +opts="$(ExtractMenuOpts "\(kopt_[[:alnum:]_]\+\)")" +test -z "$opts" || eval "$opts" +CustomKopts=$(GetMenuOpts "\(kopt_[[:alnum:]_]\+\)") + +# Extract the grub root +grub_root_device=$(GetMenuOpt "groot" "$grub_root_device") + +# Extract the old recovery value +alternative=$(GetMenuOpt "recovery" "$alternative") + +# Extract the alternative value +alternative=$(GetMenuOpt "alternative" "$alternative") + +# Extract the lockalternative value +lockalternative=$(GetMenuOpt "lockalternative" "$lockalternative") + +# Extract the additional default options +defoptions=$(GetMenuOpt "defoptions" "$defoptions") + +# Extract the lockold value +lockold=$(GetMenuOpt "lockold" "$lockold") + +# Extract Xen hypervisor options +xenhopt=$(GetMenuOpt "xenhopt" "$xenhopt") + +# Extract Xen Linux kernel options +xenkopt=$(GetMenuOpt "xenkopt" "$xenkopt") + +# Extract the howmany value +howmany=$(GetMenuOpt "howmany" "$howmany") + +# Extract the memtest86 value +memtest86=$(GetMenuOpt "memtest86" "$memtest86") + + +# Extract the updatedefaultentry option +updatedefaultentry=$(GetMenuOpt "updatedefaultentry" "$updatedefaultentry") + +# Extract the savedefault option +savedefault=$(GetMenuOpt "savedefault" "$savedefault") + +# Generate the menu options we want to insert +buffer=$(tempfile) +echo $start >> $buffer +echo "## lines between the AUTOMAGIC KERNELS LIST markers will be modified" >> $buffer +echo "## by the debian update-grub script except for the default options below" >> $buffer +echo >> $buffer +echo "## DO NOT UNCOMMENT THEM, Just edit them to your needs" >> $buffer +echo >> $buffer +echo "## ## Start Default Options ##" >> $buffer + +echo "## default kernel options" >> $buffer +echo "## default kernel options for automagic boot options" >> $buffer +echo "## If you want special options for specific kernels use kopt_x_y_z" >> $buffer +echo "## where x.y.z is kernel version. Minor versions can be omitted." >> $buffer +echo "## e.g. kopt=root=/dev/hda1 ro" >> $buffer +echo "## kopt_2_6_8=root=/dev/hdc1 ro" >> $buffer +echo "## kopt_2_6_8_2_686=root=/dev/hdc2 ro" >> $buffer +echo "# kopt=$kopt" >> $buffer +if [ -n "$CustomKopts" ] ; then + echo "$CustomKopts" >> $buffer +elif [ -n "$kopt_2_6" ] && [ "$kopt" != "$kopt_2_6" ]; then + echo "# kopt_2_6=$kopt_2_6" >> $buffer +fi +echo >> $buffer + +echo "## default grub root device" >> $buffer +echo "## e.g. groot=(hd0,0)" >> $buffer +echo "# groot=$grub_root_device" >> $buffer +echo >> $buffer + +echo "## should update-grub create alternative automagic boot options" >> $buffer +echo "## e.g. alternative=true" >> $buffer +echo "## alternative=false" >> $buffer +echo "# alternative=$alternative" >> $buffer +echo >> $buffer + +echo "## should update-grub lock alternative automagic boot options" >> $buffer +echo "## e.g. lockalternative=true" >> $buffer +echo "## lockalternative=false" >> $buffer +echo "# lockalternative=$lockalternative" >> $buffer +echo >> $buffer + +echo "## additional options to use with the default boot option, but not with the" >> $buffer +echo "## alternatives" >> $buffer +echo "## e.g. defoptions=vga=791 resume=/dev/hda5" >> $buffer +echo "# defoptions=$defoptions" >> $buffer +echo >> $buffer + +echo "## should update-grub lock old automagic boot options" >> $buffer +echo "## e.g. lockold=false" >> $buffer +echo "## lockold=true" >> $buffer +echo "# lockold=$lockold" >> $buffer +echo >> $buffer + +echo "## Xen hypervisor options to use with the default Xen boot option" >> $buffer +echo "# xenhopt=$xenhopt" >> $buffer +echo >> $buffer + +echo "## Xen Linux kernel options to use with the default Xen boot option" >> $buffer +echo "# xenkopt=$xenkopt" >> $buffer +echo >> $buffer + +echo "## altoption boot targets option" >> $buffer +echo "## multiple altoptions lines are allowed" >> $buffer +echo "## e.g. altoptions=(extra menu suffix) extra boot options" >> $buffer +echo "## altoptions=(single-user) single" >> $buffer + +if ! grep -q "^# altoptions" $menu ; then + echo "# altoptions=$altoptions" >> $buffer +else + grep "^# altoptions" $menu >> $buffer +fi +echo >> $buffer + +echo "## controls how many kernels should be put into the $menu_file_basename" >> $buffer +echo "## only counts the first occurence of a kernel, not the" >> $buffer +echo "## alternative kernel options" >> $buffer +echo "## e.g. howmany=all" >> $buffer +echo "## howmany=7" >> $buffer +echo "# howmany=$howmany" >> $buffer +echo >> $buffer + + +echo "## should update-grub create memtest86 boot option" >> $buffer +echo "## e.g. memtest86=true" >> $buffer +echo "## memtest86=false" >> $buffer +echo "# memtest86=$memtest86" >> $buffer +echo >> $buffer + +echo "## should update-grub adjust the value of the default booted system" >> $buffer +echo "## can be true or false" >> $buffer +echo "# updatedefaultentry=$updatedefaultentry" >> $buffer +echo >> $buffer + +echo "## should update-grub add savedefault to the default options" >> $buffer +echo "## can be true or false" >> $buffer +echo "# savedefault=$savedefault" >> $buffer +echo >> $buffer + +echo "## ## End Default Options ##" >> $buffer +echo >> $buffer + +echo -n "Searching for splash image ... " >&2 +current_splash=`grep '^splashimage=' ${menu_file} || true` +grub_dir_rel=`make_system_path_relative_to_its_root $grub_dir` +splashimage_path="splashimage=${grub_root_device}/${grub_dir_rel##${kernel_dir}}/splash.xpm.gz" +if [ `sed -e "/^$start/,/^$end/d" $menu_file | grep -c '^splashimage='` != "0" ] ; then + #checks for splashscreen defined outside the autoupdated part + splashimage=$(grep '^splashimage=' ${menu_file}) + echo "found: ${splashimage##*=}" >&2 + echo >&2 +elif [ -f "${grub_dir}/splash.xpm.gz" ] && [ "$current_splash" = "" ]; then + echo "found: /boot/grub/splash.xpm.gz" >&2 + echo "$splashimage_path" >> $buffer + echo >> $buffer +elif [ -f "${grub_dir}/splash.xpm.gz" ] && [ "$current_splash" = "$splashimage_path" ]; then + echo "found: /boot/grub/splash.xpm.gz" >&2 + echo "$splashimage_path" >> $buffer + echo >> $buffer +elif [ "$current_splash" != "" ] && [ "$current_splash" != "$splashimage_path" ]; then + echo "found but preserving previous setting: $(grep '^splashimage=' ${menu_file})" >&2 + echo "$current_splash" >> $buffer + echo >> $buffer +else + echo "none found, skipping ..." >&2 +fi + +xen0Kernels="" +# First kernels with xen0 support. +for ver in `grep -l CONFIG_XEN=y /boot/config* | sed -e s%/boot/config-%%`; do + if ! grep -q CONFIG_XEN_PRIVILEGED_GUEST=y /boot/config-$ver ; then + continue + fi + # ver is a kernel version + kern="/boot/vmlinuz-$ver" + if [ -r $kern ] ; then + newerKernels="" + for i in $xen0Kernels ; do + res=$(CompareVersions "$kern" "$i") + if [ "$kern" != "" ] && [ "$res" -gt 0 ] ; then + newerKernels="$newerKernels $kern $i" + kern="" + else + newerKernels="$newerKernels $i" + fi + done + if [ "$kern" != "" ] ; then + newerKernels="$newerKernels $kern" + fi + xen0Kernels="$newerKernels" + fi +done + +sortedKernels="" +for kern in $(/bin/ls -1vr /boot | grep -v "dpkg-*" | grep "^vmlinuz-") ; do + kern="/boot/$kern" + newerKernels="" + for i in $sortedKernels ; do + res=$(CompareVersions "$kern" "$i") + if [ "$kern" != "" ] && [ "$res" -gt 0 ] ; then + newerKernels="$newerKernels $kern $i" + kern="" + else + newerKernels="$newerKernels $i" + fi + done + if [ "$kern" != "" ] ; then + newerKernels="$newerKernels $kern" + fi + sortedKernels="$newerKernels" +done + +if test -f "/boot/vmlinuz.old" ; then + sortedKernels="/boot/vmlinuz.old $sortedKernels" +fi +if test -f "/boot/vmlinuz" ; then + sortedKernels="/boot/vmlinuz $sortedKernels" +fi + +hypervisors="" +for hyp in /boot/xen-*.gz; do + if [ ! -h "$hyp" ] && [ -f "$hyp" ]; then + hypervisors="$hypervisors `basename "$hyp"`" + fi +done + +#Finding the value the default line +use_grub_set_default="false" +if test "$updatedefaultentry" = "true" ; then + defaultEntryNumber=$(sed -ne 's/^[[:blank:]]*default[[:blank:]]*\(.*\).*/\1/p' $menu) + + if [ "$defaultEntryNumber" = "saved" ] ; then + defaultEntryNumber=$(sed 'q' "$grub_dir/default") + use_grub_set_default="true" + fi + + if test -n "$defaultEntryNumber"; then + defaultEntryNumberPlusOne=$(expr $defaultEntryNumber \+ 1); + defaultEntry=$(grep "^[[:blank:]]*title" $menu | sed -ne "${defaultEntryNumberPlusOne}p" | sed -ne ";s/^[[:blank:]]*title[[:blank:]]*//p") + defaultEntry=$(echo $defaultEntry | sed -e "s/[[:blank:]]*$//") # don't trust trailing blanks + else + notChangeDefault="yes" + fi +else + notChangeDefault="yes" +fi + +case "$host_os" in + freebsd|*/kfreebsd) + if test -e /boot/loader.gz ; then + kernel=/boot/loader.gz + else + kernel=/boot/loader + fi + write_kernel_entry "" "" "" "$grub_root_device" "$kernel" "" "" "" "$savedefault" "" + ;; +esac + +## heres where we start writing out the kernel entries +counter=0 + +case "$grub_root_device" in +[^A-Za-z0-9]*) grub_root_type='root' ;; +*) grub_root_type='uuid' ;; +esac + +grub2name="${kernel_dir}/grub/core.img" +if [ "$LET_US_TRY_GRUB_2" = "true" ] \ + && test -f /boot/grub/core.img ; then + echo "Found GRUB 2: $grub2name" >&2 + cat >> $buffer << EOF +title Chainload into GRUB 2 +$grub_root_type $grub_root_device +kernel $grub2name + +title `echo ───────────────────────────────────────────────────────────────────── | iconv -f utf-8 -t cp437` +root + +title When you have verified GRUB 2 works, you can use this command to +root + +title complete the upgrade: upgrade-from-grub-legacy +root + +title `echo ───────────────────────────────────────────────────────────────────── | iconv -f utf-8 -t cp437` +root + +EOF +fi + + +# Xen entries first. +for kern in $xen0Kernels ; do + if test ! x"$howmany" = x"all" ; then + if [ $counter -gt $howmany ] ; then + break + fi + fi + + kernelName=$(basename $kern) + kernelVersion=$(echo $kernelName | sed -e 's/vmlinuz//') + + initrdName=$(FindInitrdName "/boot" "$kernelVersion") + initrd="" + + kernel=$kernel_dir/$kernelName + if [ -n "$initrdName" ] ; then + initrd=$kernel_dir/$initrdName + fi + + kernelVersion=$(echo $kernelVersion | sed -e 's/^-//') + currentOpt=$(get_kernel_opt $kernelVersion) + + hypervisorVersions=$(FindXenHypervisorVersions "$kernelVersion") + + found= + for hypervisorVersion in $hypervisorVersions; do + hypervisor="$kernel_dir/xen-$hypervisorVersion.gz" + if [ -e "$hypervisor" ]; then + found=1 + + echo "Found Xen hypervisor $hypervisorVersion, kernel: $kernel" >&2 + + write_kernel_entry "$kernelVersion" '' '' "$grub_root_device" \ + "$kernel" "$currentOpt $xenkopt" '' "$initrd" "$savedefault" '' \ + Xen "$hypervisor" "$hypervisorVersion" "$xenhopt" + counter=$(($counter + 1)) + fi + done + + if [ -z $found ]; then + for hypervisor in $hypervisors; do + hypVersion=`basename "$hypervisor" .gz | sed s%xen-%%` + + echo "Found Xen hypervisor $hypVersion, kernel: $kernel" >&2 + + write_kernel_entry "$kernelVersion" '' '' "$grub_root_device" \ + "$kernel" "$currentOpt $xenkopt" '' "$initrd" "$savedefault" '' \ + Xen "$kernel_dir/$hypervisor" "$hypVersion" "$xenhopt" + counter=$(($counter + 1)) + done + fi +done + +for kern in $sortedKernels ; do + counter=$(($counter + 1)) + if test ! x"$howmany" = x"all" ; then + if [ $counter -gt $howmany ] ; then + break + fi + fi + kernelName=$(basename $kern) + kernelVersion=$(echo $kernelName | sed -e 's/vmlinuz//') + initrdName=$(FindInitrdName "/boot" "$kernelVersion") + initrd="" + + kernel=$kernel_dir/$kernelName + if [ -n "$initrdName" ] ; then + initrd=$kernel_dir/$initrdName + fi + + echo "Found kernel: $kernel" >&2 + + if [ "$kernelName" = "vmlinuz" ]; then + if [ -L "/boot/$kernelName" ]; then + kernelVersion=`readlink -f "/boot/$kernelName"` + kernelVersion=$(echo $kernelVersion | sed -e 's/.*vmlinuz-//') + kernelVersion="$kernelVersion Default" + else + kernelVersion="Default" + fi + fi + if [ "$kernelName" = "vmlinuz.old" ]; then + if [ -L "/boot/$kernelName" ]; then + kernelVersion=`readlink -f "/boot/$kernelName"` + kernelVersion=$(echo $kernelVersion | sed -e 's/.*vmlinuz-//') + kernelVersion="$kernelVersion Previous" + else + kernelVersion="Previous" + fi + fi + kernelVersion=$(echo $kernelVersion | sed -e 's/^-//') + + currentOpt=$(get_kernel_opt $kernelVersion) + + do_lockold=$lockold + # do not lockold for the first entry + [ $counter -eq 1 ] && do_lockold=false + + write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" "$kernel" \ + "$currentOpt $defoptions" "" "$initrd" "$savedefault" "$do_lockold" + + # insert the alternative boot options + if test ! x"$alternative" = x"false" ; then + # for each altoptions line do this stuff + sed -ne 's/# altoptions=\(.*\)/\1/p' $buffer | while read line; do + descr=$(echo $line | sed -ne 's/\(([^)]*)\)[[:space:]]\(.*\)/\1/p') + suffix=$(echo $line | sed -ne 's/\(([^)]*)\)[[:space:]]\(.*\)/\2/p') + + test x"$lockalternative" = x"true" && do_lockold=false + write_kernel_entry "$kernelVersion" "$descr" "$lockalternative" \ + "$grub_root_device" "$kernel" "$currentOpt" "$suffix" "$initrd" \ + "$savedefault" "$do_lockold" + + done + fi +done + +memtest86names="memtest86 memtest86+" + +if test ! x"$memtest86" = x"false" ; then + for name in $memtest86names ; do + if test -f "/boot/$name.bin" ; then + kernelVersion="$name" + kernel="$kernel_dir/$name.bin" + currentOpt= + initrd= + + echo "Found kernel: $kernel" >&2 + + write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" \ + "$kernel" "$currentOpt" "" "$initrd" "false" "" + fi + done +fi + +echo $end >> $buffer + +echo -n "Updating $menu ... " >&2 +# Insert the new options into the menu +if ! grep -q "^$start" $menu ; then + cat $buffer >> $menu + rm -f $buffer +else + umask 077 + sed -e "/^$start/,/^$end/{ + /^$start/r $buffer + d + } + " $menu > $menu.new + cat $menu.new > $menu + rm -f $buffer $menu.new +fi + +# Function to update the default value +set_default_value() { + if [ "$use_grub_set_default" = "true" ] ; then + grub-set-default $1 + else + value="$1" + newmenu=$(tempfile) + sed -e "s/^[[:blank:]]*default[[:blank:]]*[[:digit:]]*\(.*\)/default ${value}\1/;b" $menu > $newmenu + cat $newmenu > $menu + rm -f $newmenu + unset newmenu + fi +} + +#Updating the default number +if [ "$LET_US_TRY_GRUB_2" = "true" ] && test -f /boot/grub/core.img ; then + set_default_value "0" +elif test -z "$notChangeDefault"; then + newDefaultNumberPlusOne=$(grep "^[[:blank:]]*title[[:blank:]]*" $menu | grep -n "${defaultEntry}" | cut -f1 -d ":" | sed -ne "1p") + if test -z "$newDefaultNumberPlusOne"; then + echo "Previous default entry removed, resetting to 0">&2 + set_default_value "0" + elif test -z "$defaultEntry"; then + echo "Value of default value matches no entry, resetting to 0" >&2 + set_default_value "0" + else + if test "$newDefaultNumberPlusOne" = "1"; then + newDefaultNumber="0" + else + newDefaultNumber=$(expr $newDefaultNumberPlusOne - 1) + fi + echo "Updating the default booting kernel">&2 + set_default_value "$newDefaultNumber" + fi +fi + +echo "done" >&2 +echo >&2 --- grub2-1.96+20080724.orig/debian/legacy/upgrade-from-grub-legacy +++ grub2-1.96+20080724/debian/legacy/upgrade-from-grub-legacy @@ -0,0 +1,31 @@ +#!/bin/bash -e + +echo -e "\nInstalling GRUB to Master Boot Record of your first hard drive ...\n" >&2 +grub-install "(hd0)" + +if test ! -f /boot/grub/grub.cfg ; then + echo -e "\nCalling update-grub to generate grub.cfg\n" >&2 + update-grub || cat << EOF +Failed to generate /boot/grub/grub.cfg but GRUB2 has been already installed to +your MBR. +THIS MEANS YOU HAVE CURRENTLY AN UNBOOTABLE SYSTEM. +Either fix the error from update-grub and run $0 again +or install old grub again and run grub-install from it to have again +grub-legacy in your MBR. +EOF +fi + +# These never contain any valuable information, and they aren't useful for +# boot anymore, since we just overwrote MBR/PBR. +rm -f /boot/grub/{{xfs,reiserfs,e2fs,fat,jfs,minix}_stage1_5,stage{1,2}} + +cat << EOF + +GRUB Legacy has been removed, but its configuration files have been preserved, +since this script cannot determine if they contain valuable information. If +you would like to remove the configuration files as well, use the following +command: + + rm -f /boot/grub/menu.lst* + +EOF --- grub2-1.96+20080724.orig/debian/patches/00_xfs.diff +++ grub2-1.96+20080724/debian/patches/00_xfs.diff @@ -0,0 +1,50 @@ + +Fixes "out of partition" error with XFS. See #436943. + +diff --git a/fs/xfs.c b/fs/xfs.c +index 7da3e40..72d6a5f 100644 +--- a/fs/xfs.c ++++ b/fs/xfs.c +@@ -56,7 +56,7 @@ struct grub_xfs_sblock + struct grub_xfs_dir_header + { + grub_uint8_t count; +- grub_uint8_t i8count; ++ grub_uint8_t smallno; + union + { + grub_uint32_t i4; +@@ -423,7 +423,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + case XFS_INODE_FORMAT_INO: + { + struct grub_xfs_dir_entry *de = &diro->inode.data.dir.direntry[0]; +- int smallino = !diro->inode.data.dir.dirhead.i8count; ++ int smallino = !diro->inode.data.dir.dirhead.smallno; + int i; + grub_uint64_t parent; + +@@ -433,12 +433,12 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + { + parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent.i4); + parent = grub_cpu_to_be64 (parent); ++ /* The header is a bit smaller than usual. */ ++ de = (struct grub_xfs_dir_entry *) ((char *) de - 4); + } + else + { +- parent = diro->inode.data.dir.dirhead.parent.i8; +- /* The header is a bit bigger than usual. */ +- de = (struct grub_xfs_dir_entry *) ((char *) de + 4); ++ parent = *(grub_uint64_t *) &diro->inode.data.dir.dirhead.parent.i8; + } + + /* Synthesize the direntries for `.' and `..'. */ +@@ -448,7 +448,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + if (call_hook (parent, "..")) + return 1; + +- for (i = 0; i < diro->inode.data.dir.dirhead.count; i++) ++ for (i = 0; i < diro->inode.data.dir.dirhead.count; i++) + { + grub_uint64_t ino; + void *inopos = (((char *) de) --- grub2-1.96+20080724.orig/debian/patches/02_mdraid_sb_raid_disks.diff +++ grub2-1.96+20080724/debian/patches/02_mdraid_sb_raid_disks.diff @@ -0,0 +1,11 @@ +--- disk/raid.c 2008-08-25 20:21:55.000000000 +0200 ++++ disk/raid.c 2008-08-25 20:23:28.000000000 +0200 +@@ -459,7 +459,7 @@ + array->version = sb.major_version; + array->level = sb.level; + array->layout = sb.layout; +- array->total_devs = sb.nr_disks; ++ array->total_devs = sb.raid_disks; + array->nr_devs = 0; + array->uuid[0] = sb.set_uuid0; + array->uuid[1] = sb.set_uuid1; --- grub2-1.96+20080724.orig/debian/patches/03_disable_floppies.diff +++ grub2-1.96+20080724/debian/patches/03_disable_floppies.diff @@ -0,0 +1,28 @@ + +Author: Robert Millan + +An ugly kludge. Should this be merged upstream? + +Index: util/biosdisk.c +=================================================================== +--- util/biosdisk.c (revision 1832) ++++ util/biosdisk.c (working copy) +@@ -544,6 +544,18 @@ + continue; + } + ++ if (! strncmp (p, "/dev/fd", sizeof ("/dev/fd") - 1)) ++ { ++ char *q = p + sizeof ("/dev/fd") - 1; ++ if (*q >= '0' && *q <= '9') ++ { ++ free (map[drive].drive); ++ map[drive].drive = NULL; ++ grub_util_info ("`%s' looks like a floppy drive, skipping", p); ++ continue; ++ } ++ } ++ + #ifdef __linux__ + /* On Linux, the devfs uses symbolic links horribly, and that + confuses the interface very much, so use realpath to expand --- grub2-1.96+20080724.orig/debian/patches/901_dpkg_version_comparison.diff +++ grub2-1.96+20080724/debian/patches/901_dpkg_version_comparison.diff @@ -0,0 +1,25 @@ +diff -ur grub2/util/grub.d/10_linux.in grub2.new/util/grub.d/10_linux.in +--- grub2/util/grub.d/10_linux.in 2008-06-26 09:03:26.000000000 +0200 ++++ grub2.new/util/grub.d/10_linux.in 2008-08-10 20:01:49.000000000 +0200 +@@ -67,18 +67,12 @@ + + test_gt () + { +- local a=`echo $1 | sed -e "s/vmlinu[zx]-//g"` +- local b=`echo $2 | sed -e "s/vmlinu[zx]-//g"` +- local cmp=gt ++ local a=`echo $1 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` ++ local b=`echo $2 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` + if [ "x$b" = "x" ] ; then + return 0 + fi +- case $a:$b in +- *.old:*.old) ;; +- *.old:*) a=`echo -n $a | sed -e s/\.old$//g` ; cmp=gt ;; +- *:*.old) b=`echo -n $b | sed -e s/\.old$//g` ; cmp=ge ;; +- esac +- test_numeric $a $cmp $b ++ dpkg --compare-versions "$a" gt "$b" + return $? + } + --- grub2-1.96+20080724.orig/debian/patches/00_fix_overflow.diff +++ grub2-1.96+20080724/debian/patches/00_fix_overflow.diff @@ -0,0 +1,23 @@ +diff -ur grub2-1.96+20080724/normal/main.c grub2-1.96+20080724-2/normal/main.c +--- grub2-1.96+20080724/normal/main.c 2008-02-02 17:48:52.000000000 +0100 ++++ grub2-1.96+20080724-2/normal/main.c 2008-07-29 17:19:46.024867049 +0200 +@@ -97,9 +97,6 @@ + } + else + { +- if (c == '\n') +- break; +- + if (pos >= max_len) + { + char *old_cmdline = cmdline; +@@ -112,6 +109,9 @@ + } + } + ++ if (c == '\n') ++ break; ++ + cmdline[pos++] = c; + } + } --- grub2-1.96+20080724.orig/debian/patches/11_lvm-Fix-possible-NULL-value-handling.diff +++ grub2-1.96+20080724/debian/patches/11_lvm-Fix-possible-NULL-value-handling.diff @@ -0,0 +1,42 @@ +>From 0eafe5ddadee8e690672b452121eb8cf88736293 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 28 Oct 2008 18:46:28 +0200 +Subject: [PATCH] lvm: Fix possible NULL value handling + +Add a missing NULL check, and correct them by moving the pointer +operations after the actual check. +--- + disk/lvm.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/disk/lvm.c b/disk/lvm.c +index cd9e447..df8c99b 100644 +--- a/disk/lvm.c ++++ b/disk/lvm.c +@@ -373,9 +373,10 @@ grub_lvm_scan_device (const char *name) + grub_memcpy (pv->name, p, s); + pv->name[s] = '\0'; + +- p = grub_strstr (p, "id = \"") + sizeof("id = \"") - 1; ++ p = grub_strstr (p, "id = \""); + if (p == NULL) + goto pvs_fail; ++ p += sizeof("id = \"") - 1; + + grub_memcpy (pv->id, p, GRUB_LVM_ID_STRLEN); + pv->id[GRUB_LVM_ID_STRLEN] = '\0'; +@@ -387,7 +388,10 @@ grub_lvm_scan_device (const char *name) + pv->next = vg->pvs; + vg->pvs = pv; + +- p = grub_strchr (p, '}') + 1; ++ p = grub_strchr (p, '}'); ++ if (p == NULL) ++ goto pvs_fail; ++ p++; + + continue; + pvs_fail: +-- +1.6.0.2 + --- grub2-1.96+20080724.orig/debian/patches/06_olpc_prefix_hack.diff +++ grub2-1.96+20080724/debian/patches/06_olpc_prefix_hack.diff @@ -0,0 +1,24 @@ + +This sucks, but it's better than what OFW was giving us. + +diff -ur grub2-1.96+20080601.old/kern/ieee1275/init.c grub2-1.96+20080601/kern/ieee1275/init.c +--- grub2-1.96+20080601.old/kern/ieee1275/init.c 2008-06-08 20:40:07.000000000 +0200 ++++ grub2-1.96+20080601/kern/ieee1275/init.c 2008-06-08 22:03:17.000000000 +0200 +@@ -84,6 +84,9 @@ + /* We already set prefix in grub_machine_init(). */ + return; + ++#ifdef __i386__ ++ grub_env_set ("prefix", "(sd,1)/"); ++#else + if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath", &bootpath, + sizeof (bootpath), 0)) + { +@@ -121,6 +124,7 @@ + + grub_free (filename); + grub_free (prefix); ++#endif + } + + /* Claim some available memory in the first /memory node. */ --- grub2-1.96+20080724.orig/debian/patches/00_raid_duped_disks.diff +++ grub2-1.96+20080724/debian/patches/00_raid_duped_disks.diff @@ -0,0 +1,30 @@ +2008-07-28 Robert Millan + + * disk/raid.c (grub_raid_scan_device): Do not abort when two disks + with the same number are found, just use issue a warning with + grub_dprintf(), as this error has been reported to be non-fatal. + +Index: disk/raid.c +=================================================================== +--- disk/raid.c (revision 1741) ++++ disk/raid.c (revision 1742) +@@ -442,16 +442,10 @@ + } + + if (array->device[sb.this_disk.number] != NULL) +- { +- /* We found multiple devices with the same number. Again, +- this shouldn't happen.*/ +- +- grub_error (GRUB_ERR_BAD_NUMBER, +- "Found two disks with the number %d?!?", ++ /* We found multiple devices with the same number. Again, ++ this shouldn't happen.*/ ++ grub_dprintf ("raid", "Found two disks with the number %d?!?", + sb.this_disk.number); +- +- return 0; +- } + } + + /* Add an array to the list if we didn't find any. */ --- grub2-1.96+20080724.orig/debian/patches/00_getline.diff +++ grub2-1.96+20080724/debian/patches/00_getline.diff @@ -0,0 +1,13 @@ +Index: normal/menu_entry.c +=================================================================== +--- normal/menu_entry.c (Revision 1758) ++++ normal/menu_entry.c (Revision 1759) +@@ -996,7 +996,7 @@ + linep->len = p - linep->buf; + for (p = linep->buf; grub_isspace (*p); p++) + ; +- *line = p; ++ *line = grub_strdup (p); + currline++; + return 0; + } --- grub2-1.96+20080724.orig/debian/patches/00_raid_lvm_error_handling.diff +++ grub2-1.96+20080724/debian/patches/00_raid_lvm_error_handling.diff @@ -0,0 +1,43 @@ + +Fix for #494501 + +2008-08-16 Robert Millan + + * disk/raid.c (grub_raid_init): Handle/report errors set by + grub_device_iterate(). + * disk/lvm.c (grub_lvm_init): Likewise. + +Index: disk/lvm.c +=================================================================== +--- disk/lvm.c (revision 1808) ++++ disk/lvm.c (revision 1809) +@@ -586,6 +586,12 @@ + GRUB_MOD_INIT(lvm) + { + grub_device_iterate (&grub_lvm_scan_device); ++ if (grub_errno) ++ { ++ grub_print_error (); ++ grub_errno = GRUB_ERR_NONE; ++ } ++ + grub_disk_dev_register (&grub_lvm_dev); + } + +Index: disk/raid.c +=================================================================== +--- disk/raid.c (revision 1808) ++++ disk/raid.c (revision 1809) +@@ -580,6 +580,12 @@ + GRUB_MOD_INIT(raid) + { + grub_device_iterate (&grub_raid_scan_device); ++ if (grub_errno) ++ { ++ grub_print_error (); ++ grub_errno = GRUB_ERR_NONE; ++ } ++ + grub_disk_dev_register (&grub_raid_dev); + } + --- grub2-1.96+20080724.orig/debian/patches/08_core_in_fs.diff +++ grub2-1.96+20080724/debian/patches/08_core_in_fs.diff @@ -0,0 +1,31 @@ +Index: util/i386/pc/grub-setup.c +=================================================================== +--- util/i386/pc/grub-setup.c (revision 1828) ++++ util/i386/pc/grub-setup.c (working copy) +@@ -53,6 +53,7 @@ + + #define DEFAULT_BOOT_FILE "boot.img" + #define DEFAULT_CORE_FILE "core.img" ++#define CORE_IMG_IN_FS "setup_left_core_image_in_filesystem" + + /* This is the blocklist used in the diskboot image. */ + struct boot_blocklist +@@ -350,6 +351,8 @@ + boot_img)) + grub_util_error ("%s", grub_errmsg); + ++ unlink (DEFAULT_DIRECTORY "/" CORE_IMG_IN_FS); ++ + goto finish; + } + else +@@ -365,6 +368,9 @@ + /* The core image must be put on a filesystem unfortunately. */ + grub_util_info ("will leave the core image on the filesystem"); + ++ fp = fopen (DEFAULT_DIRECTORY "/" CORE_IMG_IN_FS, "w"); ++ fclose (fp); ++ + /* Make sure that GRUB reads the identical image as the OS. */ + tmp_img = xmalloc (core_size); + core_path_dev = grub_util_get_path (DEFAULT_DIRECTORY, core_file); --- grub2-1.96+20080724.orig/debian/patches/00_kern_device_red_herring.diff +++ grub2-1.96+20080724/debian/patches/00_kern_device_red_herring.diff @@ -0,0 +1,10 @@ +--- kern/device.c 2008-07-04 00:56:43.000000000 +0200 ++++ kern/device.c.new 2008-08-26 23:44:32.000000000 +0200 +@@ -50,7 +50,6 @@ + disk = grub_disk_open (name); + if (! disk) + { +- grub_error (GRUB_ERR_BAD_DEVICE, "unknown device %s", name); + goto fail; + } + --- grub2-1.96+20080724.orig/debian/patches/00_ntfs_insensitive.diff +++ grub2-1.96+20080724/debian/patches/00_ntfs_insensitive.diff @@ -0,0 +1,102 @@ +2008-09-05 Bean + + * fs/fshelp.c (grub_fshelp_find_file): Handle case insensitive names. + + * fs/ntfs.c (list_file): Ignore names in DOS namespace, set the case + insensitive bit for names in Win32 and Win32 & DOS namespace. + + * include/grub/fshelp.h (GRUB_FSHELP_CASE_INSENSITIVE): New macro. + + * include/grub/types.h (LONG_MAX): Likewise. + +Index: fs/ntfs.c +=================================================================== +--- fs/ntfs.c (revision 1851) ++++ fs/ntfs.c (revision 1852) +@@ -575,13 +575,20 @@ + + while (1) + { +- char *ustr; ++ char *ustr, namespace; ++ + if (pos[0xC] & 2) /* end signature */ + break; + +- np = pos + 0x52; +- ns = (unsigned char) *(np - 2); +- if (ns) ++ np = pos + 0x50; ++ ns = (unsigned char) *(np++); ++ namespace = *(np++); ++ ++ /* ++ * Ignore files in DOS namespace, as they will reappear as Win32 ++ * names. ++ */ ++ if ((ns) && (namespace != 2)) + { + enum grub_fshelp_filetype type; + struct grub_ntfs_file *fdiro; +@@ -610,6 +617,9 @@ + *grub_utf16_to_utf8 ((grub_uint8_t *) ustr, (grub_uint16_t *) np, + ns) = '\0'; + ++ if (namespace) ++ type |= GRUB_FSHELP_CASE_INSENSITIVE; ++ + if (hook (ustr, type, fdiro)) + { + grub_free (ustr); +Index: fs/fshelp.c +=================================================================== +--- fs/fshelp.c (revision 1851) ++++ fs/fshelp.c (revision 1852) +@@ -80,14 +80,17 @@ + enum grub_fshelp_filetype filetype, + grub_fshelp_node_t node) + { +- if (type == GRUB_FSHELP_UNKNOWN || grub_strcmp (name, filename)) ++ if (filetype == GRUB_FSHELP_UNKNOWN || ++ (grub_strcmp (name, filename) && ++ (! (filetype & GRUB_FSHELP_CASE_INSENSITIVE) || ++ grub_strncasecmp (name, filename, LONG_MAX)))) + { + grub_free (node); + return 0; + } + + /* The node is found, stop iterating over the nodes. */ +- type = filetype; ++ type = filetype & ~GRUB_FSHELP_CASE_INSENSITIVE; + oldnode = currnode; + currnode = node; + +Index: include/grub/types.h +=================================================================== +--- include/grub/types.h (revision 1851) ++++ include/grub/types.h (revision 1852) +@@ -94,8 +94,10 @@ + + #if GRUB_CPU_SIZEOF_VOID_P == 8 + # define ULONG_MAX 18446744073709551615UL ++# define LONG_MAX 9223372036854775807UL + #else + # define ULONG_MAX 4294967295UL ++# define LONG_MAX 2147483647UL + #endif + + /* The type for representing a file offset. */ +Index: include/grub/fshelp.h +=================================================================== +--- include/grub/fshelp.h (revision 1851) ++++ include/grub/fshelp.h (revision 1852) +@@ -26,6 +26,8 @@ + + typedef struct grub_fshelp_node *grub_fshelp_node_t; + ++#define GRUB_FSHELP_CASE_INSENSITIVE 0x100 ++ + enum grub_fshelp_filetype + { + GRUB_FSHELP_UNKNOWN, --- grub2-1.96+20080724.orig/debian/patches/00_uuid_boot.diff +++ grub2-1.96+20080724/debian/patches/00_uuid_boot.diff @@ -0,0 +1,107 @@ +2008-07-26 Robert Millan + + * include/grub/i386/pc/kernel.h (GRUB_KERNEL_MACHINE_DATA_END): + Increase from 0x50 to 0x60. + * util/i386/pc/grub-install.in: Detect cross-disk installs, and + use UUIDs to identify the root drive for them. If that's not + possible, abort. + * util/i386/pc/grub-setup.c (setup): Do not special-case, or even + check, for cross-disk installs. + +diff -ur grub2/include/grub/i386/pc/kernel.h grub2.new/include/grub/i386/pc/kernel.h +--- grub2/include/grub/i386/pc/kernel.h 2008-07-13 03:55:15.000000000 +0200 ++++ grub2.new/include/grub/i386/pc/kernel.h 2008-07-26 01:15:13.000000000 +0200 +@@ -41,7 +41,7 @@ + #define GRUB_KERNEL_MACHINE_PREFIX 0x20 + + /* End of the data section. */ +-#define GRUB_KERNEL_MACHINE_DATA_END 0x50 ++#define GRUB_KERNEL_MACHINE_DATA_END 0x60 + + /* The size of the first region which won't be compressed. */ + #if defined(ENABLE_LZO) +diff -ur grub2/util/i386/pc/grub-install.in grub2.new/util/i386/pc/grub-install.in +--- grub2/util/i386/pc/grub-install.in 2008-07-13 20:13:36.000000000 +0200 ++++ grub2.new/util/i386/pc/grub-install.in 2008-07-26 01:16:20.000000000 +0200 +@@ -231,15 +231,34 @@ + # Device abstraction module, if any (lvm, raid). + devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}` + ++# The order in this list is critical. Be careful when modifying it. ++modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module" ++ ++prefix_drive= + if [ "x${devabstraction_module}" = "x" ] ; then +- prefix_drive= ++ if echo "${install_device}" | grep -qx "(.*)" ; then ++ install_drive="${install_device}" ++ else ++ install_drive="`$grub_probe --target=drive --device ${install_device}`" ++ fi ++ grub_drive="`$grub_probe --target=drive --device ${grub_device}`" ++ ++ # Strip partition number ++ install_drive="`echo ${install_drive} | sed -e s/,[0-9]*//g`" ++ grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*//g`" ++ if [ "x${grub_drive}" != "x${install_drive}" ] ; then ++ uuid="`$grub_probe --target=fs_uuid --device ${grub_device}`" ++ if [ "x${uuid}" = "x" ] ; then ++ echo "You attempted a cross-disk install, but the filesystem containing ${grubdir} does not support UUIDs." 1>&2 ++ exit 1 ++ fi ++ prefix_drive="(UUID=${uuid})" ++ modules="$modules fs_uuid" ++ fi + else + prefix_drive=`$grub_probe --target=drive --device ${grub_device}` + fi + +-# The order in this list is critical. Be careful when modifying it. +-modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module" +- + $grub_mkimage --output=${grubdir}/core.img \ + --prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}` \ + $modules || exit 1 +diff -ur grub2/util/i386/pc/grub-setup.c grub2.new/util/i386/pc/grub-setup.c +--- grub2/util/i386/pc/grub-setup.c 2008-07-01 01:52:24.000000000 +0200 ++++ grub2.new/util/i386/pc/grub-setup.c 2008-07-26 01:15:13.000000000 +0200 +@@ -339,17 +339,11 @@ + if (grub_disk_write (dest_dev->disk, embed_region.start, 0, core_size, core_img)) + grub_util_error ("%s", grub_errmsg); + +- /* The boot image and the core image are on the same drive, +- so there is no need to specify the boot drive explicitly. */ +- *boot_drive = 0xff; +- *kernel_sector = grub_cpu_to_le64 (embed_region.start); ++ /* FIXME: can this be skipped? */ ++ *boot_drive = 0xFF; ++ *root_drive = 0xFF; + +- /* If the root device is different from the destination device, +- it is necessary to embed the root drive explicitly. */ +- if (root_dev->disk->id != dest_dev->disk->id) +- *root_drive = (grub_uint8_t) root_dev->disk->id; +- else +- *root_drive = 0xFF; ++ *kernel_sector = grub_cpu_to_le64 (embed_region.start); + + /* Write the boot image onto the disk. */ + if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, +@@ -480,15 +474,8 @@ + + *kernel_sector = grub_cpu_to_le64 (first_sector); + +- /* If the destination device is different from the root device, +- it is necessary to embed the boot drive explicitly. */ +- if (root_dev->disk->id != dest_dev->disk->id) +- *boot_drive = (grub_uint8_t) root_dev->disk->id; +- else +- *boot_drive = 0xFF; +- +- /* When the core image is not embedded, the root device always follows +- the boot device. */ ++ /* FIXME: can this be skipped? */ ++ *boot_drive = 0xFF; + *root_drive = 0xFF; + + *install_dos_part = grub_cpu_to_le32 (dos_part); --- grub2-1.96+20080724.orig/debian/patches/00_strengthen_apple_partmap_check.diff +++ grub2-1.96+20080724/debian/patches/00_strengthen_apple_partmap_check.diff @@ -0,0 +1,78 @@ + +2008-07-28 Robert Millan + + * partmap/apple.c (GRUB_APPLE_HEADER_MAGIC): New macro. + (struct grub_apple_header): New struct. Describes the layout of + the partmap header. + (apple_partition_map_iterate): Check the header magic as well as the + partition magic (which was already being checked). + +Index: partmap/apple.c +=================================================================== +--- partmap/apple.c (revision 1745) ++++ partmap/apple.c (revision 1746) +@@ -22,11 +22,19 @@ + #include + #include + ++#define GRUB_APPLE_HEADER_MAGIC 0x4552 + #define GRUB_APPLE_PART_MAGIC 0x504D + ++struct grub_apple_header ++{ ++ /* The magic number to identify the partition map, it should have ++ the value `0x4552'. */ ++ grub_uint16_t magic; ++}; ++ + struct grub_apple_part + { +- /* The magic number to idenify this as a partition, it should have ++ /* The magic number to identify this as a partition, it should have + the value `0x504D'. */ + grub_uint16_t magic; + +@@ -98,6 +106,7 @@ + const grub_partition_t partition)) + { + struct grub_partition part; ++ struct grub_apple_header aheader; + struct grub_apple_part apart; + struct grub_disk raw; + int partno = 0; +@@ -109,6 +118,18 @@ + + part.partmap = &grub_apple_partition_map; + ++ if (grub_disk_read (&raw, 0, 0, sizeof (aheader), (char *) &aheader)) ++ return grub_errno; ++ ++ if (grub_be_to_cpu16 (aheader.magic) != GRUB_APPLE_HEADER_MAGIC) ++ { ++ grub_dprintf ("partition", ++ "bad magic (found 0x%x; wanted 0x%x\n", ++ grub_be_to_cpu16 (aheader.magic), ++ GRUB_APPLE_HEADER_MAGIC); ++ goto fail; ++ } ++ + for (;;) + { + if (grub_disk_read (&raw, pos / GRUB_DISK_SECTOR_SIZE, +@@ -147,11 +168,12 @@ + partno++; + } + +- if (pos == GRUB_DISK_SECTOR_SIZE) +- return grub_error (GRUB_ERR_BAD_PART_TABLE, +- "Apple partition map not found."); ++ if (pos != GRUB_DISK_SECTOR_SIZE) ++ return 0; + +- return 0; ++ fail: ++ return grub_error (GRUB_ERR_BAD_PART_TABLE, ++ "Apple partition map not found."); + } + + --- grub2-1.96+20080724.orig/debian/patches/09_handle_md_slash_N.diff +++ grub2-1.96+20080724/debian/patches/09_handle_md_slash_N.diff @@ -0,0 +1,19 @@ +--- grub2-1.96+20080724.orig/util/getroot.c 2008-05-16 23:39:52.000000000 +0200 ++++ grub2-1.96+20080724/util/getroot.c 2008-08-12 14:56:14.000000000 +0200 +@@ -461,10 +461,16 @@ + else if (os_dev[7] >= '0' && os_dev[7] <= '9') + { + memcpy (grub_dev, os_dev + 5, 7); + grub_dev[7] = '\0'; + } ++ else if (os_dev[7] == '/' && os_dev[8] >= '0' && os_dev[8] <= '9') ++ { ++ memcpy (grub_dev, os_dev + 5, 2); ++ memcpy (grub_dev + 2, os_dev + 8, 5); ++ grub_dev[7] = '\0'; ++ } + else + grub_util_error ("Unknown kind of RAID device `%s'", os_dev); + + break; + --- grub2-1.96+20080724.orig/debian/patches/00_fix_double_prefix.diff +++ grub2-1.96+20080724/debian/patches/00_fix_double_prefix.diff @@ -0,0 +1,13 @@ +Index: kern/i386/pc/init.c +=================================================================== +--- kern/i386/pc/init.c (Revision 1763) ++++ kern/i386/pc/init.c (Arbeitskopie) +@@ -64,7 +64,7 @@ + /* XXX: This should be enough. */ + char dev[100]; + +- if (grub_install_dos_part != -2) ++ if (grub_prefix[0] != '(') + { + /* If the root drive is not set explicitly, assume that it is identical + to the boot drive. */ --- grub2-1.96+20080724.orig/debian/patches/00_grub_print_error.diff +++ grub2-1.96+20080724/debian/patches/00_grub_print_error.diff @@ -0,0 +1,111 @@ + +Prevents error handling fixes in disk/{raid,lvm}.c from breaking scripts +that rely on grub-probe. + +2008-08-14 Felix Zielcke + + * include/grub/err.h (grub_err_printf): New function prototype. + * util/misc.c (grub_err_printf): New function. + * kern/misc.c [! GRUB_UTIL] (grub_err_printf): New alias for + grub_printf. + * kern/err.c (grub_print_error): Use grub_err_printf. + +Index: kern/err.c +=================================================================== +--- kern/err.c (revision 1804) ++++ kern/err.c (revision 1805) +@@ -1,7 +1,7 @@ + /* err.c - error handling routines */ + /* + * GRUB -- GRand Unified Bootloader +- * Copyright (C) 2002,2005,2007 Free Software Foundation, Inc. ++ * Copyright (C) 2002,2005,2007,2008 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -121,14 +121,14 @@ + do + { + if (grub_errno != GRUB_ERR_NONE) +- grub_printf ("error: %s\n", grub_errmsg); ++ grub_err_printf ("error: %s\n", grub_errmsg); + } + while (grub_error_pop ()); + + /* If there was an assert while using error stack, report about it. */ + if (grub_error_stack_assert) + { +- grub_printf ("assert: error stack overflow detected!\n"); ++ grub_err_printf ("assert: error stack overflow detected!\n"); + grub_error_stack_assert = 0; + } + } +Index: kern/misc.c +=================================================================== +--- kern/misc.c (revision 1804) ++++ kern/misc.c (revision 1805) +@@ -134,6 +134,11 @@ + return ret; + } + ++#ifndef GRUB_UTIL ++int grub_err_printf (const char *fmt, ...) ++__attribute__ ((alias("grub_printf"))); ++#endif ++ + void + grub_real_dprintf (const char *file, const int line, const char *condition, + const char *fmt, ...) +Index: include/grub/err.h +=================================================================== +--- include/grub/err.h (revision 1804) ++++ include/grub/err.h (revision 1805) +@@ -1,7 +1,7 @@ + /* err.h - error numbers and prototypes */ + /* + * GRUB -- GRand Unified Bootloader +- * Copyright (C) 2002,2005,2007 Free Software Foundation, Inc. ++ * Copyright (C) 2002,2005,2007,2008 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -64,5 +64,7 @@ + void EXPORT_FUNC(grub_error_push) (void); + int EXPORT_FUNC(grub_error_pop) (void); + void EXPORT_FUNC(grub_print_error) (void); ++int EXPORT_FUNC(grub_err_printf) (const char *fmt, ...) ++__attribute__ ((format (printf, 1, 2))); + + #endif /* ! GRUB_ERR_HEADER */ +Index: util/misc.c +=================================================================== +--- util/misc.c (revision 1804) ++++ util/misc.c (revision 1805) +@@ -1,6 +1,6 @@ + /* + * GRUB -- GRand Unified Bootloader +- * Copyright (C) 2002,2003,2005,2006,2007 Free Software Foundation, Inc. ++ * Copyright (C) 2002,2003,2005,2006,2007,2008 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -74,6 +74,19 @@ + exit (1); + } + ++int ++grub_err_printf (const char *fmt, ...) ++{ ++ va_list ap; ++ int ret; ++ ++ va_start (ap, fmt); ++ ret = vfprintf (stderr, fmt, ap); ++ va_end (ap); ++ ++ return ret; ++} ++ + void * + xmalloc (size_t size) + { --- grub2-1.96+20080724.orig/debian/patches/05_insmod_in_rescue_disks.diff +++ grub2-1.96+20080724/debian/patches/05_insmod_in_rescue_disks.diff @@ -0,0 +1,13 @@ +--- ../grub2/docs/grub.cfg 2008-04-29 14:17:33.000000000 +0200 ++++ docs/grub.cfg 2008-04-29 14:52:22.000000000 +0200 +@@ -2,6 +2,10 @@ + # Sample GRUB configuration file + # + ++insmod biosdisk ++insmod pc ++insmod gpt ++ + # Boot automatically after 30 secs. + set timeout=30 + --- grub2-1.96+20080724.orig/debian/patches/00_fix_raid0.diff +++ grub2-1.96+20080724/debian/patches/00_fix_raid0.diff @@ -0,0 +1,15 @@ +--- grub2-1.96+20080724.orig/disk/raid.c 2008-07-04 00:56:43.000000000 +0200 ++++ grub2-1.96+20080724/disk/raid.c 2008-08-12 14:09:32.000000000 +0200 +@@ -175,11 +175,11 @@ + err = grub_disk_read (array->device[disknr], read_sector, 0, + read_size << GRUB_DISK_SECTOR_BITS, buf); + if (err) + break; + +- buf += read_size; ++ buf += (read_size << GRUB_DISK_SECTOR_BITS); + size -= read_size; + if (! size) + break; + + if (size > array->chunk_size) --- grub2-1.96+20080724.orig/debian/patches/00_skip_dev_dm.diff +++ grub2-1.96+20080724/debian/patches/00_skip_dev_dm.diff @@ -0,0 +1,28 @@ +2008-07-25 Robert Millan + + * util/getroot.c (find_root_device): Skip devices that match + /dev/dm-[0-9]. This lets the real device be found for any type of + abstraction (LVM, EVMS, RAID..). + +Index: util/getroot.c +=================================================================== +--- util/getroot.c (revision 1732) ++++ util/getroot.c (revision 1733) +@@ -229,6 +229,17 @@ + + if (S_ISBLK (st.st_mode) && st.st_rdev == dev) + { ++#ifdef __linux__ ++ /* Skip useless device names like /dev/dm-0, which prevent us from ++ finding /dev/mapper/*, /dev/evms/*, /dev/md*, etc. */ ++ if (ent->d_name[0] == 'd' && ++ ent->d_name[1] == 'm' && ++ ent->d_name[2] == '-' && ++ ent->d_name[3] >= '0' && ++ ent->d_name[3] <= '9') ++ continue; ++#endif ++ + /* Found! */ + char *res; + char *cwd; --- grub2-1.96+20080724.orig/debian/patches/00_trailing_slash.diff +++ grub2-1.96+20080724/debian/patches/00_trailing_slash.diff @@ -0,0 +1,15 @@ +2008-08-02 Robert Millan + + * util/i386/pc/grub-install.in: Remove trailing slash from prefix. + +--- util/i386/pc/grub-install.in~ 2008-07-13 20:13:36.000000000 +0200 ++++ util/i386/pc/grub-install.in 2008-10-29 20:16:31.000000000 +0100 +@@ -241,7 +241,7 @@ + modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module" + + $grub_mkimage --output=${grubdir}/core.img \ +- --prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`/ \ ++ --prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}` \ + $modules || exit 1 + + # Now perform the installation. --- grub2-1.96+20080724.orig/debian/patches/12_lvm-Fix-error-recovery-by-only-adding-objects-when.diff +++ grub2-1.96+20080724/debian/patches/12_lvm-Fix-error-recovery-by-only-adding-objects-when.diff @@ -0,0 +1,80 @@ +>From e3ad4a3bea534a1269ecc03d307d189b098d0b62 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Mon, 27 Oct 2008 23:22:06 +0200 +Subject: [PATCH] lvm: Fix error recovery by only adding objects when we cannot fail + +The error unwinding code was keeping objects referenced in the lists +even when those were being unfreed. Delay the addition of those objects +to the lists until the code is not going to be able to fail, so that +that part does not need to be unwound. +--- + disk/lvm.c | 22 ++++++++++++---------- + 1 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/disk/lvm.c b/disk/lvm.c +index df8c99b..2ee1f7f 100644 +--- a/disk/lvm.c ++++ b/disk/lvm.c +@@ -345,8 +345,6 @@ grub_lvm_scan_device (const char *name) + + vg->lvs = NULL; + vg->pvs = NULL; +- vg->next = vg_list; +- vg_list = vg; + + p = grub_strstr (p, "physical_volumes {"); + if (p) +@@ -384,14 +382,15 @@ grub_lvm_scan_device (const char *name) + pv->start = grub_lvm_getvalue (&p, "pe_start = "); + if (p == NULL) + goto pvs_fail; +- pv->disk = NULL; +- pv->next = vg->pvs; +- vg->pvs = pv; + + p = grub_strchr (p, '}'); + if (p == NULL) + goto pvs_fail; + p++; ++ ++ pv->disk = NULL; ++ pv->next = vg->pvs; ++ vg->pvs = pv; + + continue; + pvs_fail: +@@ -520,16 +519,16 @@ grub_lvm_scan_device (const char *name) + goto fail4; + } + +- lv->number = lv_count++; +- lv->vg = vg; +- lv->next = vg->lvs; +- vg->lvs = lv; +- + p = grub_strchr (p, '}'); + if (p == NULL) + goto lvs_fail; + p += 3; + ++ lv->number = lv_count++; ++ lv->vg = vg; ++ lv->next = vg->lvs; ++ vg->lvs = lv; ++ + continue; + lvs_fail: + grub_free (lv->name); +@@ -537,6 +536,9 @@ grub_lvm_scan_device (const char *name) + goto fail4; + } + } ++ ++ vg->next = vg_list; ++ vg_list = vg; + } + else + { +-- +1.6.0.2 + --- grub2-1.96+20080724.orig/debian/patches/902_boot_blocklist_hack.diff +++ grub2-1.96+20080724/debian/patches/902_boot_blocklist_hack.diff @@ -0,0 +1,20 @@ +Index: util/i386/pc/grub-setup.c +=================================================================== +--- util/i386/pc/grub-setup.c (revision 1836) ++++ util/i386/pc/grub-setup.c (working copy) +@@ -383,6 +383,15 @@ + grub_disk_cache_invalidate_all (); + + file = grub_file_open (core_path_dev); ++ ++ if (grub_errno == GRUB_ERR_FILE_NOT_FOUND) ++ { ++ /* Clean the previous grub_errno */ ++ grub_errno = GRUB_ERR_NONE; ++ strcpy (core_path_dev, "/grub/core.img"); ++ file = grub_file_open (core_path_dev); ++ } ++ + if (file) + { + if (grub_file_size (file) != core_size) --- grub2-1.96+20080724.orig/debian/patches/03_ubuntu_grub_standards.diff +++ grub2-1.96+20080724/debian/patches/03_ubuntu_grub_standards.diff @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' grub2-1.96+20080724/util/grub.d/10_linux.in grub2-1.96+20080724.new/util/grub.d/10_linux.in +--- grub2-1.96+20080724/util/grub.d/10_linux.in 2008-06-26 17:03:26.000000000 +1000 ++++ grub2-1.96+20080724.new/util/grub.d/10_linux.in 2008-11-17 11:25:53.000000000 +1100 +@@ -24,7 +24,7 @@ + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux + else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ OS="${GRUB_DISTRIBUTOR}" + fi + + # loop-AES arranges things so that /dev/loop/X can be our root device, but --- grub2-1.96+20080724.orig/debian/patches/07_skip_invalid_bsd_parts.diff +++ grub2-1.96+20080724/debian/patches/07_skip_invalid_bsd_parts.diff @@ -0,0 +1,42 @@ +2008-07-31 Felix Zielcke + + * partmap/pc.c (pc_partition_map_iterate): Skip over invalid BSD partitions + or if there's no space for the disk label and print the partition number on a + invalid magic + +Index: partmap/pc.c +=================================================================== +--- partmap/pc.c (Revision 1753) ++++ partmap/pc.c (Arbeitskopie) +@@ -160,9 +160,11 @@ + { + /* Check if the BSD label is within the DOS partition. */ + if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR) +- return grub_error (GRUB_ERR_BAD_PART_TABLE, +- "no space for disk label"); +- ++ { ++ grub_error (GRUB_ERR_BAD_PART_TABLE, ++ "no space for disk label"); ++ continue; ++ } + /* Read the BSD label. */ + if (grub_disk_read (&raw, + (p.start +@@ -175,10 +177,12 @@ + /* Check if it is valid. */ + if (label.magic + != grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC)) +- return grub_error (GRUB_ERR_BAD_PART_TABLE, +- "invalid disk label magic 0x%x", +- label.magic); +- ++ { ++ grub_error (GRUB_ERR_BAD_PART_TABLE, ++ "invalid disk label magic 0x%x on partition %d", ++ label.magic,p.index); ++ continue; ++ } + for (pcdata.bsd_part = 0; + pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions); + pcdata.bsd_part++) --- grub2-1.96+20080724.orig/debian/patches/00_skip_dev_leading_dot.diff +++ grub2-1.96+20080724/debian/patches/00_skip_dev_leading_dot.diff @@ -0,0 +1,35 @@ +2008-08-23 Robert Millan + + * util/getroot.c (find_root_device): Skip anything that starts with + a dot, not just directories. This avoids things like /dev/.tmp.md0. + +Index: util/getroot.c +=================================================================== +--- util/getroot.c (Revision 1825) ++++ util/getroot.c (Revision 1826) +@@ -196,7 +196,10 @@ + { + struct stat st; + +- if (strcmp (ent->d_name, ".") == 0 || strcmp (ent->d_name, "..") == 0) ++ /* Avoid: ++ - dotfiles (like "/dev/.tmp.md0") since they could be duplicates. ++ - dotdirs (like "/dev/.static") since they could contain duplicates. */ ++ if (ent->d_name[0] == '.') + continue; + + if (lstat (ent->d_name, &st) < 0) +@@ -207,11 +210,9 @@ + /* Don't follow symbolic links. */ + continue; + +- if (S_ISDIR (st.st_mode) && ent->d_name[0] != '.') ++ if (S_ISDIR (st.st_mode)) + { +- /* Find it recursively, but avoid dotdirs (like ".static") since they +- could contain duplicates, which would later break the +- pathname-based check */ ++ /* Find it recursively. */ + char *res; + + res = find_root_device (ent->d_name, dev); --- grub2-1.96+20080724.orig/debian/patches/00_lvm_circular_metadata.diff +++ grub2-1.96+20080724/debian/patches/00_lvm_circular_metadata.diff @@ -0,0 +1,52 @@ +2008-10-05 Hans Lambermont + + * disk/lvm.c (grub_lvm_scan_device): Allocate buffer space for the + circular metadata worst case scenario. If the metadata is circular + then copy the wrap in place. + * include/grub/lvm.h: Add GRUB_LVM_MDA_HEADER_SIZE, from the LVM2 + project lib/format_text/layout.h + Circular metadata bug found and patch debugged by Jan Derk Gerlings. + +Index: disk/lvm.c +=================================================================== +--- disk/lvm.c (revision 1885) ++++ disk/lvm.c (revision 1886) +@@ -281,7 +281,8 @@ grub_lvm_scan_device (const char *name) + goto fail; + } + +- metadatabuf = grub_malloc (mda_size); ++ /* Allocate buffer space for the circular worst-case scenario. */ ++ metadatabuf = grub_malloc (2 * mda_size); + if (! metadatabuf) + goto fail; + +@@ -300,6 +301,16 @@ grub_lvm_scan_device (const char *name) + } + + rlocn = mdah->raw_locns; ++ if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) > ++ grub_le_to_cpu64 (mdah->size)) ++ { ++ /* Metadata is circular. Copy the wrap in place. */ ++ grub_memcpy (metadatabuf + mda_size, ++ metadatabuf + GRUB_LVM_MDA_HEADER_SIZE, ++ grub_le_to_cpu64 (rlocn->offset) + ++ grub_le_to_cpu64 (rlocn->size) - ++ grub_le_to_cpu64 (mdah->size)); ++ } + p = q = metadatabuf + grub_le_to_cpu64 (rlocn->offset); + + while (*q != ' ' && q < metadatabuf + mda_size) +Index: include/grub/lvm.h +=================================================================== +--- include/grub/lvm.h (revision 1885) ++++ include/grub/lvm.h (revision 1886) +@@ -103,6 +103,7 @@ struct grub_lvm_pv_header { + + #define GRUB_LVM_FMTT_MAGIC "\040\114\126\115\062\040\170\133\065\101\045\162\060\116\052\076" + #define GRUB_LVM_FMTT_VERSION 1 ++#define GRUB_LVM_MDA_HEADER_SIZE 512 + + /* On disk */ + struct grub_lvm_raw_locn { --- grub2-1.96+20080724.orig/debian/patches/10_handle_lvm_dash_escaping.diff +++ grub2-1.96+20080724/debian/patches/10_handle_lvm_dash_escaping.diff @@ -0,0 +1,24 @@ +--- grub2-1.96+20080724.orig/util/getroot.c 2008-08-12 15:02:14.000000000 +0200 ++++ grub2-1.96+20080724/util/getroot.c 2008-08-12 15:05:22.000000000 +0200 +@@ -410,9 +410,22 @@ + switch (grub_util_get_dev_abstraction (os_dev)) + { + case GRUB_DEV_ABSTRACTION_LVM: +- grub_dev = xmalloc (strlen (os_dev) - 12 + 1); ++ { ++ unsigned char i, j, k, l; + +- strcpy (grub_dev, os_dev + 12); ++ j = sizeof ("/dev/mapper/") -1; ++ l = strlen (os_dev) - j + 1; ++ ++ grub_dev = xmalloc (strlen (os_dev) - strlen ("/dev/mapper/") + 1); ++ ++ for (i = 0, k = 0; i < l; i++) ++ { ++ grub_dev[k] = os_dev[j + i]; ++ k++; ++ if (os_dev[j + i] == '-' && os_dev[j + i + 1] == '-') ++ i++; ++ } ++ } --- grub2-1.96+20080724.orig/debian/patches/01_grub_legacy_0_based_partitions.diff +++ grub2-1.96+20080724/debian/patches/01_grub_legacy_0_based_partitions.diff @@ -0,0 +1,11 @@ +--- util/biosdisk.c 2008-02-11 16:47:35.000000000 +0100 ++++ util/biosdisk.c 2008-02-28 17:00:20.000000000 +0100 +@@ -584,7 +584,7 @@ + sprintf (p, (drive & 0x80) ? "hd%d" : "fd%d", drive & ~0x80); + + if (dos_part >= 0) +- sprintf (p + strlen (p), ",%d", dos_part + 1); ++ sprintf (p + strlen (p), ",%d", dos_part + (getenv ("GRUB_LEGACY_0_BASED_PARTITIONS") ? 0 : 1)); + + if (bsd_part >= 0) + sprintf (p + strlen (p), ",%c", bsd_part + 'a'); --- grub2-1.96+20080724.orig/debian/default/grub +++ grub2-1.96+20080724/debian/default/grub @@ -0,0 +1,12 @@ +# This file is sourced by update-grub, and its variables are propagated +# to its children in /etc/grub.d/ +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux +#GRUB_DISABLE_LINUX_UUID=true --- grub2-1.96+20080724.orig/debian/po/es.po +++ grub2-1.96+20080724/debian/po/es.po @@ -0,0 +1,151 @@ +# grub2 translation to spanish. +# Copyright (C) 2007 THE GRUB2'S COPYRIGHT HOLDER +# This file is distributed under the same license as the grub2 package. +# Changes: +# - Initial translation +# Maria Germana Oliveira Blazetic, 2007. +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# +msgid "" +msgstr "" +"Project-Id-Version: grub2 1.96\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2008-06-26 09:34-0430\n" +"Last-Translator: Maria Germana Oliveira Blazetic \n" +"Language-Team: Spanish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Esquema de transición numérica de GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"GRUB 2 ha cambiado el esquema de numeración, como en la versión 1.95. Ahora " +"las particiones comenzarán desde el 1 en vez de 0. Esto se hace para hacerlo " +"consistente con los nombres de dispositivo de Linux y otros núcleos usados " +"en Debian. Por ejemplo, cuando se usa Linux como kernel, \"(hd0, 1)\" se " +"refiere a la misma partición que el dispositivo /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Por esto, existe la posibilidad de que su sistema no sea capaz de iniciar si " +"se ejecuta update-grup(8) antes de actualizar GRUB, ya que se generaría un " +"archivo grub.cfg que su versión instalada de GRUB no sería capaz de leer " +"correctamente. Para asegurar que su sistema inicie correctamente, debe:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Reinstalar GRUB (generalmente, ejecutando grub-install).\n" +" - Volver a ejecutar update-grub para generar un nuevo archivo grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "¿Desea realizar la carga en cadena desde menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Los scripts de actualización han detectado en /boot/grub una configuración " +"heredada de una versión anterior de GRUB." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Para reemplazar la versión anterior de GRUB en su sistema, se recomienda que " +"se ajuste /boot/grub/menu.lst para que cargue en cadena a partir de su " +"configuración preexistente de GRUB. Este paso debería hacerse ahora de forma " +"automática." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Antes de instalar GRUB 2 directamente en el MBR («Master Boot Record») se " +"recomienda que acepte cargarlo en cadena desde el menu.lst y que verifique " +"que puede utilizar la nueva configuración de GRUB 2." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"En cualquier caso, cuando quiera que GRUB 2 se inicie directamente desde el " +"MBR, puede hacerlo usando (como root) la siguiente orden:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" --- grub2-1.96+20080724.orig/debian/po/ru.po +++ grub2-1.96+20080724/debian/po/ru.po @@ -0,0 +1,140 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: grub2 1.96+20081005-1\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-10-28 20:32+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Переход на новую схему нумерации в GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Начиная с версии 1.95, в GRUB 2 изменилась схема нумерации. Номера разделов " +"теперь начинают отсчитывать с 1, а не с 0. Это соответствует именам " +"устройств Linux и другим ядрам, используемым в Debian. Например, при " +"использовании ядра Linux, \"(hd0,1)\" указывает на тот же раздел что и " +"устройство /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"В связи с этим, возникает опасность получить незагружаемую систему: если " +"запустить update-grub(8) перед обновлением GRUB, то будет создан файл grub." +"cfg, который установленный GRUB пока не может обработать правильно. Чтобы " +"система смогла загружаться, выполните следующее:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Переустановите загрузчик GRUB (обычно, запустив grub-install).\n" +" - Перезапустите update-grub для создания нового grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Загружать по цепочке из menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Сценарии обновления GRUB обнаружили установку предыдущего поколения GRUB в /" +"boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Чтобы заменить версию предыдущего поколения GRUB в системе, рекомендуется " +"исправить /boot/grub/menu.lst так, чтобы он загружал по цепочке GRUB 2 из " +"существующей установки GRUB предыдущего поколения. Это может быть сделано " +"автоматически прямо сейчас." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Рекомендуется ответить утвердительно и проверить, что новая настройка GRUB 2 " +"работает так как нужно, перед тем как устанавливать её непосредственно в MBR " +"(главную загрузочную запись)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"В любом случае, всякий раз, когда вы хотите, чтобы GRUB 2 загружался " +"непосредственно из MBR, выполните следующую команду (имея права " +"суперпользователя):" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Командная строка Linux:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"Представленная ниже строка была извлечена из параметра `kopt' " +"старого файла GRUB menu.lst. Проверьте, что всё правильно, или измените её, " +"если требуется." + --- grub2-1.96+20080724.orig/debian/po/eu.po +++ grub2-1.96+20080724/debian/po/eu.po @@ -0,0 +1,137 @@ +# translation of eu.po to Basque +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Piarres Beobide , 2008. +# Iñaki Larrañaga Murgoitio , 2008. +msgid "" +msgstr "" +"Project-Id-Version: eu\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-10-29 19:36+0100\n" +"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"Language-Team: Basque \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "GRUB 1.95 zenbatze eskema aldaketa" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"1.95 bertsiotik aurrera, GRUB 2-ak zenbatze eskema aldatu du. Partizioak " +"orain 1-etik hasiko dira zenbatzen 0-tik beharrean. Hau Linux eta Debianen " +"erabiltzen diren kernel ezberdinekin bateragarritasuna mantentzeko egiten " +"da. Adibidez, kernel bezala Linux erabiltzean, \"(hd0,)\" Eta /dev/sda1 " +"gailu nodoa partizio berdina dira." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Hau dela eta aukera bat dago zure sistema abioezina geratzeko update-grub(8) " +"GRUB bertsio berritu ondoren exekutatzen bada instalaturiko GRUB-ek " +"analizatu ezin duen grub.cfg fitxategi bat sortuaz. Zure sistema abiatu " +"ahal izango duzula ziurtatzeko:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - GRUB berrinstalatu (normalean grub-install exekutatuaz).\n" +" - update-grub berriz exekutatu grub.cfg berri sortzeko." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Kargatu menu.lst bidez?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"GRUB eguneraketa skriptak GRUB zahar konfigurazioa aurkitu dute /boot/grub-" +"en." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"GRUB zaharraren bertsioa behar bezala ordezkatzeko, gomendagarria da /boot/" +"grub/menu.lst doitzea GRUB 2 dagoeneko instalaturik duzun GRUB zaharraren " +"bidez kargatzea. Urrats hau automatikoki egin daiteke orain." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Gomendagarria da GRUB 2 menu.lst bidez kargatzea onartzea, GRUB 2 " +"konfigurazioak zure beharrak betetzen dituela egiatzatzeko MBR-ran (Master " +"Boot Record) zuzenean instalatu beharrean." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"Edozein kasutan, GRUB 2 zuzenean zure MBR-tik kargatzea nahi duzunean " +"komando hau exekutatuaz (root gisa) lortu dezakezu:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "eguneratu-grub-zaharretik" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linux-eko komando-lerroa:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"Linux-eko komando-lerro hau GRUB Legacy-ren menu.lst fitxategiko 'kopt' parametrotik atera da. " +"Egiaztatu zuzena dela, eta eraldatu behar izanez gero." + --- grub2-1.96+20080724.orig/debian/po/de.po +++ grub2-1.96+20080724/debian/po/de.po @@ -0,0 +1,136 @@ +# Translation of grub2 debconf templates to German +# Copyright (C) Helge Kreutzmann , 2007, 2008. +# This file is distributed under the same license as the grub2 package. +# +msgid "" +msgstr "" +"Project-Id-Version: grub2 1.96+20080203-1\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-10-28 18:01+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "bergang des Partitionierungs-Nummerierungs-Schemas in GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Mit Version 1.95 hat GRUB 2 sein Partitionierungs-Nummerierungs-Schema " +"gendert. Partitionen werden jetzt ab 1 statt ab 0 gezhlt. Dies ist damit " +"mit den Gertenamen von Linux und anderen Kerneln in Debian konsistent. Zum " +"Beispiel beim Einsatz von Linux als Kernel bezieht sich (hd0,1) auf die " +"gleiche Platte wie der /dev/sda1-Gerteknoten." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Daher besteht ein Risiko, dass Ihr System nicht mehr starten kann, falls " +"update-grub(8) luft, bevor GRUB aktualisiert wird und somit eine grub.cfg-" +"Datei erstellt, die der installierte GRUB nicht korrekt auslesen kann. Um " +"sicherzustellen, dass Ihr System starten kann, mssen Sie folgendes " +"durchfhren:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - GRUB neu installieren (typischerweise via Ausfhrung von grub-install)\n" +" - update-grub erneut ausfhren, um eine neue grub.cfg zu erstellen." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Chainload (Kettenladen) aus menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Die Upgrade-Skripte von GRUB haben eine GRUB Legacy-Installation in /boot/" +"grub erkannt." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Um die Legacy-Version von GRUB auf Ihrem System zu ersetzen, wird empfohlen, " +"dass /boot/grub/menu.lst angepasst wird, so dass GRUB 2 aus Ihrer " +"existierenden GRUB-Legacy-Einrichtung heraus geladen wird. Dieser Schritt " +"kann jetzt automatisch vollzogen werden." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Es wird empfohlen, dass Sie dem Chainloading von GRUB 2 aus der menu.lst " +"zustimmen und berprfen, dass die GRUB 2-Installation fr Sie funktioniert, " +"bevor Sie diese direkt in Ihren MBR (Master Boot Record) installieren." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"Auf jeden Fall knnen Sie den folgenden Befehl (als root) eingeben, wenn Sie " +"mchten, dass GRUB 2 direkt vom MBR geladen wird:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linux Kommandozeile:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"Die folgende Linux-Kommandozeile ist aus dem Paramter kopt in GRUB Legacys " +"menu.lst extrahiert. Bitte berprfen Sie, ob dieser korrekt ist und passen " +"Sie ihn falls notwendig an." --- grub2-1.96+20080724.orig/debian/po/ro.po +++ grub2-1.96+20080724/debian/po/ro.po @@ -0,0 +1,133 @@ +# translation of ro.po to Romanian +# Romanian translations for grub package +# Traducerea în limba română pentru pachetul grub. +# Copyright (C) 2007 THE grub'S COPYRIGHT HOLDER +# This file is distributed under the same license as the grub package. +# +# Eddy Petrisor , 2007. +# Eddy Petrișor , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ro\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2007-03-05 00:31+0200\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Tranziţia la schema de numerotare a partiţiilor pentru GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Începând cu versiunea 1.95 GRUB 2 şi-a schimbat schema de numerotare a " +"partiţiilor. Partiţiile sunt acum numerotate începând de la 1 (în loc de 0). " +"Acest lucru este consecvent cu numele de dispozitive ale Linux-ului şi a " +"altor nuclee folosite în distribuţie. De exemplu, când se foloseşte nucleul " +"Linux, „(hd0,1)” se referă la aceiaşi partiţie ca şi nodul de dispozitiv /" +"dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"De aceea, există riscul ca sistemul sa nu mai pornească: dacă update-grub(8) " +"este rulat înainte ca GRUB să fie actualizat, va genera un fişier grub.cfg " +"pe care GRUB-ul instalat nu-l va putea încă analiza corect. Pentru a asigura " +"posibilitatea de a porni sistemul ar trebui să:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Reinstalaţi GRUB (în mod normal prin rularea lui grub-install).\n" +" - Rulaţi din nou update-grub pentru a genera noul grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" --- grub2-1.96+20080724.orig/debian/po/POTFILES.in +++ grub2-1.96+20080724/debian/po/POTFILES.in @@ -0,0 +1,2 @@ +[type: gettext/rfc822deb] grub2.templates +[type: gettext/rfc822deb] grub-pc.templates --- grub2-1.96+20080724.orig/debian/po/sv.po +++ grub2-1.96+20080724/debian/po/sv.po @@ -0,0 +1,140 @@ +# translation of grub2_sv.po to Swedish +# Swedish translation for grub2. +# Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the grub2 package. +# +# Daniel Nylander , 2007. +# Martin Ågren , 2008. +msgid "" +msgstr "" +"Project-Id-Version: grub2_sv\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-11-01 18:22+0100\n" +"Last-Translator: Martin Ågren \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Övergång av partitionsnumreringsschema för GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Från och med version 1.95 har GRUB 2 ändrat sitt partitionsnumreringsschema. " +"Partitioner räknas nu fram med start från 1 istället för 0. Det här är " +"gällande standard för enhetsnamnet i Linux och de andra kärnorna som används " +"i Debian. Till exempel när Linux används som kärna refererar \"(hd0,1)\" " +"till samma partition som enhetsnoden /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"På grund av det här kan det finnas en risk att systemet inte kan startas upp " +"om update-grub(8) körs innan GRUB har uppdaterats och då genererar en grub." +"cfg-fil som den installerade GRUB ännu inte kan tolka korrekt. Om du vill " +"försäkra dig om att systemet kan startas upp behöver du:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Installera om GRUB (vanligtvis genom att köra grub-install).\n" +" - Köra update-grub igen för att generera en ny grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Kedjeladda från menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"GRUB:s uppgraderingsskript har upptäckt en gammal GRUB-inställning i /boot/" +"grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Om du vill ersätta den gamla versionen av GRUB i systemet, rekommenderas " +"att /boot/grub/menu.lst justeras till att kedjeladda GRUB 2 från din " +"existerande, gamla GRUB-inställning. Detta steg kan nu utföras automatiskt." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Det rekommenderas att GRUB 2 kedjeladdas från menu.lst så att det kan " +"säkerställas att den nya GRUB 2-inställningen fungerar innan den installeras " +"direkt till huvudstartsektorn." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"När GRUB 2 ska laddas direkt från huvudstartsektorn, kan detta åstadkommas " +"genom att (som root) köra följande kommando:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linux-kommandorad:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"Följande Linux-kommandorad hämtades från 'kopt'-parametern i " +"gamla GRUB:s menu.lst. Verifiera att den är korrekt och modifiera den om " +"nödvändigt." + --- grub2-1.96+20080724.orig/debian/po/cs.po +++ grub2-1.96+20080724/debian/po/cs.po @@ -0,0 +1,138 @@ +# Czech translation of grub2 debconf messages. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the grub2 package. +# Miroslav Kure , 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: grub2\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-10-28 09:44+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Změna číslování oblastí v GRUBu 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Od verze 1.95 změnil GRUB 2 číslovací schéma oblastí. Oblasti již nejsou " +"číslovány od nuly, ale od jedničky. To je konzistentní s názvy zařízení " +"používaných v Linuxu a ostatních jádrech dodávaných v distribuci. Například " +"při použití jádra Linux znamená \"(hd0,1)\" to stejné jako oblast /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Z tohoto důvodu zde existuje riziko, že se systém nepodaří zavést: pokud " +"bude update-grub(8) spuštěn dříve, než se aktualizuje GRUB, vytvoří soubor " +"grub.cfg, který nebude kompatibilní s novým GRUBem. Abyste zajistili, že se " +"podaří systém zavést, měli byste:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Přeinstalovat GRUB (typicky spuštěním grub-install).\n" +" - Spustit update-grub, aby se vytvořil nový grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Zavést přes menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Aktualizační skripty GRUBu rozpoznaly v /boot/grub nastavení pro předchozí " +"verzi GRUBu (tzv. GRUB Legacy)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Abyste na svém systému nahradili zastaralou verzi GRUBu, je doporučeno " +"upravit /boot/grub/menu.lst tak, aby zavedl GRUB 2 pomocí stávajícího GRUB " +"Legacy. Tento krok je nyní možno provést automaticky." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Před instalací GRUBu 2 přímo do MBR (Master Boot Record) se doporučuje " +"nejprve vyzkoušet zavedení GRUBu 2 skrze menu.lst a teprve po ověření, že " +"vše funguje očekávaným způsobem, zkusit instalaci do MBR." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"Až se rozhodnete zavádět GRUB 2 přímo z MBR, stačí jako uživatel root " +"spustit příkaz:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Parametry pro Linux:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"Následující řádka s linuxovými parametry byla získána ze starého souboru " +"menu.lst z parametru „kopt“. Zkontrolujte prosím, zda jsou parametry v " +"pořádku a případně je upravte do požadované podoby." --- grub2-1.96+20080724.orig/debian/po/ka.po +++ grub2-1.96+20080724/debian/po/ka.po @@ -0,0 +1,127 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2008-10-27 22:41+0400\n" +"Last-Translator: Aiet Kolkhi \n" +"Language-Team: Georgian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: georgian\n" +"X-Poedit-Country: GEORGIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "გსურთ Chainload ჩატვირთვა menu.lst-დან?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"GRUB-ის განახლების სკრიფტები GRUB-ის ძველ ინსტალაციას გადააწყდა /boot/grub " +"მდებარეობაში." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"იმისათვის, რომ თქვენს სისტემაზე ჩანაცვლდეს ძველი GRUB-ის ინსტალაცია, " +"სასურველია /boot/grub/menu.lst ჩასწორდეს, რომ შეასრულოს GRUB 2-ის chainload " +"ჩატვირთვა თქვენი არსებული GRUB-ის ძველი ინსტალაციიდან. ეს საფეხური " +"შესაძლებელია ახლა შესრულდეს ავტომატურად." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"სასურველია მიიღოთ menu.lst-დან GRUB 2-ის chainload მეთოდით ჩატვირთვა, ასევე " +"გადაამოწმოთ, რომ თქვენი ახალი GRUB 2-ის ინსტალაცია ფუნქციონირებდეს, სანამ " +"მას პირდაპირ Master Boot Record (MBR)-ში ჩაწერდეთ." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"ნებისმიერ შემთხვევაში, როდესაც მოისურვებთ GRUB 2 პირდაპირ MBR-დან " +"ჩაიტვირთოს, ამისათვის გაუშვით შემდეგი ბრძანება (root პრივილეგიებით):" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "ლინუქსის ბრძანების სტრიქონი:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"ლინუქსის შემდეგი ბრძანება მოძიებულ იქნა `kopt' პარამეტრიდან ძველი GRUB-ის " +"menu.lst-ში. გადაამოწმეთ, რომ იგი სწორია, ან შეცვალეთ შესაბამისად." --- grub2-1.96+20080724.orig/debian/po/gl.po +++ grub2-1.96+20080724/debian/po/gl.po @@ -0,0 +1,131 @@ +# Galician translation of grub2's debconf templates +# This file is distributed under the same license as the grub2 package. +# Jacobo Tarrio , 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: grub2\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2008-05-28 17:15+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Transición do esquema de numeración de GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"A partires da versión 1.95, GRUB 2 cambiou o esquema de numeración. Agora as " +"particións cóntanse a partires de 1 no canto de 0. Isto é así para facelo " +"consistente cos nomes de dispositivo de Linux e os outros núcleos empregados " +"en Debian. Por exemplo, ao empregar Linux coma núcleo, \"(hd0,1)\" refírese " +"á mesma partición que o nodo de dispositivo /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Debido a isto, hai unha posibilidade de que non se poida iniciar o sistema " +"se se executa update-grub(8) antes de actualizar GRUB, co que se había xerar " +"un ficheiro grub.cfg que o GRUB instalado non podería analizar " +"correctamente. Para se asegurar de que o sistema poida iniciarse, faga isto:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Reinstale GRUB (normalmente, executando grub-install).\n" +" - Volva executar update-grub para xerar un novo grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "¿Cargar en cadea desde menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Os scripts de actualización de GRUB detectaron unha configuración do GRUB " +"antigo en /boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Para substituír a versión antiga de GRUB do sistema, recoméndase axustar /" +"boot/grub/menu.lst para cargar GRUB 2 en cadea desde a configuración " +"existente do GRUB antigo. Pódese realizar este paso automaticamente agora." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Recoméndase que acepte cargar en cadea GRUB 2 desde menu.lst, e que " +"verifique que a nova configuración de GRUB 2 funciona para vostede, antes de " +"instalalo directamente no MBR (rexistro mestre de inicio)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"En calquera caso, cando queira cargar GRUB 2 directamente desde o MBR, pode " +"facelo executando (coma administrador) a seguinte orde:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" --- grub2-1.96+20080724.orig/debian/po/it.po +++ grub2-1.96+20080724/debian/po/it.po @@ -0,0 +1,138 @@ +# Italian (it) translation of debconf templates for grub2 +# Copyright (C) 2007 Software in the Public Interest +# This file is distributed under the same license as the grub2 package. +# Luca Monducci , 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: grub2 1.96+20081005 italian debconf templates\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-10-29 15:48+0100\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Cambio dello schema di numerazione in GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Dalla versione 1.95, GRUB 2 ha cambiato il proprio schema di numerazione. " +"Adesso le partizioni sono conteggiate a partire da 1 anziché da 0. Questo " +"per coerenza con i nomi dei device di Linux e degli altri kernel usati in " +"Debian. Per esempio, usando Linux come kernel, \"(hd0,1)\" fa riferimento " +"alla stessa partizione del device /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Per questo motivo c'è il rischio che il sistema diventi non avviabile; se " +"update-grub(8) viene eseguito prima dell'aggiornamento di GRUB, verrà " +"generato un file grub.cfg che non può essere correttamente interpretato " +"dalla versione di GRUB attualmente installata. Per assicurarsi che il " +"sistema rimanga avviabile si deve:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Reinstallare GRUB (tipicamente eseguendo grub-install).\n" +" - Rieseguire update-grub per generare un nuovo grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Effettuare il caricamento in cascata da menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Gli script di aggiornamento hanno rilevato una configurazione del vecchio " +"GRUB in /boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Per sostituire la vecchia versione di GRUB sul proprio sistema, si " +"raccomanda di correggere il file /boot/grub/menu.lst in modo da caricare " +"GRUB 2 in cascata dalla versione di GRUB esistente. Questa modifica può " +"essere effettuata automaticamente adesso." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Si raccomanda di accettare il caricamento in cascata di GRUB 2 da menu.lst e " +"di verificare che la nuova configurazione di GRUB 2 sia adatta alle proprie " +"necessità prima di procedere con l'installazione diretta sul MBR (Master " +"Boot Record)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"In ogni caso, per caricare GRUB 2 direttamente dal MBR, è necessario " +"eseguire (da root) il seguente comando:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Riga di comando Linux:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"La seguente riga di comando Linux è stata estratta dal parametro \"kopt\" " +"presente nel file menu.lst del vecchio GRUB. Controllare che sia corretta e " +"modificarla se necessario." --- grub2-1.96+20080724.orig/debian/po/nl.po +++ grub2-1.96+20080724/debian/po/nl.po @@ -0,0 +1,114 @@ +# translation of grub2_1.96+20081005-1_nl.po to Dutch +# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the grub2 package. +# +# Paul Gevers , 2008. +msgid "" +msgstr "" +"Project-Id-Version: grub2_1.96+20081005-1_nl\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-10-27 19:32-0600\n" +"Last-Translator: Paul Gevers \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "GRUB 1.95 transitie van benummeringsschema" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Vanaf versie 1.95 heeft GRUB2 zijn benummeringsschema gewijzigd. Partities " +"worden nu genummerd beginnend met 1 in plaats van 0. Dit is gedaan om het " +"consistent te maken met de apparaatnamen van Linux en andere Debian kernels. " +"Bijvoorbeeld, indien gebruik gemaakt wordt van de Linux kernel, dan verwijst " +"\"(hd0,1)\" naar dezelfde partitie als de /dev/sda1 apparaatsnode." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Als gevolg hiervan is er een kans dat uw systeem niet meer wil opstarten als " +"'update-grub(8)' gedraaid wordt voordat GRUB is vernieuwd. Er is dan een " +"grub.cfg bestand gemaakt dat niet correct door de geïnstalleerde GRUB " +"ontleed kan worden. Om er zeker van te zijn dat uw systeem op kan starten " +"dient u:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - GRUB te herinstalleren (normaal gesproken door 'grub-install' te " +"draaien).\n" +" - 'update-grub' opnieuw te draaien om een nieuwe grub.cfg te genereren." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Doorschakel vanuit menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "GRUB's opwaardeerscripts hebben een overgeërfde GRUB opstelling in /boot/grub gedetecteerd." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "In order to replace the Legacy version of GRUB in your system, it is recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from your existing GRUB Legacy setup. This step may be automaticaly performed now." +msgstr "Om de overgeërfde versie van GRUB op uw systeem te vervangen wordt het aangeraden om het /boot/grub/menu.lst bestand zo te laten aanpassen dat GRUB2 wordt doorgeschakeld (chainloading) vanuit uw bestaande overgeërfde GRUB opstelling. Deze stap kan nu automatisch worden uitgevoerd." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "It's recommended that you accept chainloading GRUB 2 from menu.lst, and verify that your new GRUB 2 setup is functional for you, before you install it directly to your MBR (Master Boot Record)." +msgstr "U wordt aangeraden om het doorschakelen van GRUB2 vanuit menu.lst te accepteren en daarna te verifiëren dat uw nieuwe GRUB2 opstelling werkt voordat u het in de MBR (Master Boot Record) installeert." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "In either case, whenever you want GRUB 2 to be loaded directly from MBR, you can do so by issuing (as root) the following command:" +msgstr "Waar u ook voor kiest, als u GRUB2 direct in de MBR wilt laden kunt u dat doen door het volgende commando uit te voeren (met beheerdersrechten (root)):" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linux-commandoregel:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "The following Linux command line was extracted from the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if necessary." +msgstr "De volgende Linux-commandoregel is gebaseerd op de 'kopt'-parameter gevonden in het menu.lst bestand van de overgeërfde GRUB. Wilt u deze op correctheid controleren en indien nodig aanpassen?" + --- grub2-1.96+20080724.orig/debian/po/ja.po +++ grub2-1.96+20080724/debian/po/ja.po @@ -0,0 +1,133 @@ +# Copyright (C) 2008 GRUB Maintainers +# This file is distributed under the same license as the grub2 package. +# Hideki Yamane (Debian-JP) , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: grub2 1.96+20080724-4\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2008-10-28 11:07+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "GRUB 1.95 でのナンバリング方法の移行" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"バージョン 1.95 で、GRUB 2 はナンバリングの方法を変更しました。パーティション" +"は 0 からではなく 1 から数えられ始めます。これによって、Linux や Debian で使" +"われている他のカーネルでのデバイス名と一致するようになります。例えば、Linux " +"をカーネルとして使っている場合、\"(hd0,1)\" は /dev/sda1 デバイスノードと同じ" +"パーティションを指します。" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"これによって、GRUB がアップデートされる前に update-grub(8) を実行してインス" +"トールしてある GRUB がまだ正しくパースできない grub.cfg ファイルを生成する" +"と、システムが起動しないようになる可能性があります。確実にシステムが起動する" +"ようにするには、以下を実行する必要があります:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - GRUB を再インストール (つまり、grub-install の実行)。\n" +" - 新しい grub.cfg を生成するため update-grub を再実行。" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "menu.lst から続けて起動 (チェーンロード)しますか?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"GRUB のアップグレードプログラムは GRUB Legacy の設定が /boot/grub にあるのを" +"検出しました。" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"システム中に存在している以前のバージョンの GRUB を置き換えるためには、/boot/" +"grub/menu.lst にある GRUB Legacy の設定を使って GRUB2 をチェーンロードするよ" +"うに調整するのがお勧めです。この作業は自動的に実行されます。" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"MBR (マスタブートレコード) に直接インストールする前に、GRUB 2 が menu.lst か" +"らチェーンロードするように設定し、新しい GRUB 2 の設定が動作するかどうかを確" +"認する事をお勧めします。" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"いずれにせよ、GRUB 2 を MBR から直接起動したくなった時いつでもは (root にて) " +"以下のコマンドを入力することで対応できます:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linux コマンド:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"以下の Linux のコマンドは GRUB Legacy の menu.lst 上の「kopt」パラメータから" +"取得されています。これが正しいものであるかを確認して、必要であれば修正してください。" --- grub2-1.96+20080724.orig/debian/po/ar.po +++ grub2-1.96+20080724/debian/po/ar.po @@ -0,0 +1,122 @@ +# translation of grub.ar.po to Arabic +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Ossama M. Khayat , 2008. +msgid "" +msgstr "" +"Project-Id-Version: grub.ar\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2008-11-02 09:24+0300\n" +"Last-Translator: Ossama M. Khayat \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "تفعيل التحميل التسلسلي من menu.lst؟" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "عثرت بريمجيات ترقية GRUB على إعداد سابق في /boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"لتستبدل النسخة السابقة من GRUB في نظامك، يُستحسن تعديل الملف /boot/grub/menu." +"lst لتحميل GRUB 2 تسلسلياً من إعداد GRUB السابق. ويمكن تنفيذ هذه الخطوة " +"تلقائياً الآن." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"يُستحسن أن تقبل التحميل التسلسلي لمدير الإقلاع GRUB من خلال الملف menu.lst، " +"وتحقق من أن إعداد GRUB 2 صالح لاستخدامك، قبل أن تُبّته مباشرة على سجل الإقلاع " +"الرئيسي MBR الخاص بك." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"في أي من الحالتين، متى ما أردت تحميل GRUB 2 مباشرة من سجل الإقلاع الرئيسي " +"MBR، يمكنك ذلك بإصدار الأمر التالي كمُستخدم root:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "سطر أوامر لينكس:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"سطر أوامر لينكس التالي تم استخراجه من مُعطى `kopt' فيملف menu.lst الخاص بحزمة " +"GRUB القديمة. رجاءً تحقق من صحته وقم بتعديله إن كانت هناك ضرورة." --- grub2-1.96+20080724.orig/debian/po/pt.po +++ grub2-1.96+20080724/debian/po/pt.po @@ -0,0 +1,138 @@ +# Portuguese translation for grub2's debconf messages +# Copyright (C) 2007 Miguel Figueiredo +# This file is distributed under the same license as the grub2 package. +# Miguel Figueiredo , 2007. +# Ricardo Silva , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: grub2 1.96+20081005-1\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-11-02 11:07+0000\n" +"Last-Translator: Ricardo Silva \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Transição do esquema de numeração do GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Na versão 1.95, o GRUB 2 mudou o seu esquema de numeração. As partições são " +"agora contadas a partir de 1 em vez de 0. Isto é consistente com os nomes " +"dos dispositivos em Linux e outros kernels utilizados na Debian. Por " +"exemplo, quando utilizar Linux como kernel, \"(hd0,1)\" refere-se à mesma " +"partição que o dispositivo /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Por causa disto, há a hipótese do seu sistema não conseguir arrancar se o " +"update-grub(8) for corrido antes do GRUB ser actualizado, o que gerará um " +"ficheiro grub.cfg que o GRUB que tem instalado não consegue processar " +"correctamente. Para assegurar que o seu sistema será capaz de arrancar, deve:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Reinstalar o GRUB (tipicamente, correndo grub-install).\n" +" - Correr novamente o update-grub para gerar um novo grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Carregar a partir do menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" +"Os scripts de actualização do GRUB detectaram uma configuração do GRUB " +"Legacy em /boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Para substituir a versão Legacy do GRUB no seu sistema, é recomendado que o /" +"boot/grub/menu.lst seja ajustado para carregar o GRUB 2 a partir da sua " +"configuração do GRUB Legacy existente. Este passo pode ser executado agora " +"automaticamente." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"É recomendado que aceite carregar o GRUB 2 a partir do menu.lst, e verifique " +"que a sua nova configuração do GRUB 2 está funcional, antes de o instalar " +"directamente no seu MBR (Master Boot Record)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"Em qualquer dos casos, quando quiser que o GRUB 2 seja carregado " +"directamente a partir do MBR, pode fazê-lo correndo o seguinte comando (como " +"root):" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linha de comandos do Linux:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"A linha de comandos do Linux que se segue foi obtida a partir do parâmetro " +"`kopt' no ficheiro menu.lst do GRUB Legacy. Por favor verifique que ela " +"está correcta, e modifique-a se necessário." --- grub2-1.96+20080724.orig/debian/po/fi.po +++ grub2-1.96+20080724/debian/po/fi.po @@ -0,0 +1,109 @@ +msgid "" +msgstr "" +"Project-Id-Version: grub2\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 15:44+0100\n" +"PO-Revision-Date: 2008-11-02 20:36+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "GRUB 1.95 numerointitavan muutos" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"Versiosta 1.95 alkaen GRUB 2 on vaihtanut numerointitapaansa. Osioiden " +"numerot alkavat nyt 1:stä 0:n sijaan. Tämä yhdenmukaistaa numeroinnin " +"Linuxin laitenimien ja muiden Debianissa käytettyjen ydinten kanssa. " +"Esimerkiksi käytettäessä Linux-ydintä ”(hd0,1)” viittaa samaan osioon kuin " +"laitetiedosto /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"Tämän muutoksen takia on mahdollista, että järjestelmästä tulee " +"käynnistyskelvoton, jos update-grub(8) ajetaan ennen kuin GRUB on " +"päivitetty. Tällöin luotaisiin grub.cfg-tiedosto, jota asennettuna oleva " +"GRUB ei vielä osaisi jäsentää oikein. Varmistaaksesi, että järjestelmä " +"voidaan käynnistää, sinun tulee:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Asentaa GRUB uudelleen (tyypillisesti ajamalla grub-install).\n" +" - Ajaa update-grub uudelleen uuden grub.cfg-tiedoston luomiseksi." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Ladataanko ketjutettuna tiedostosta menu.lst?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "GRUBin päivityskomentosarjat ovat löytäneet vanhoja GRUB-asetuksia tiedostosta /boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "In order to replace the Legacy version of GRUB in your system, it is recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from your existing GRUB Legacy setup. This step may be automaticaly performed now." +msgstr "Järjestelmässä olevan vanhan GRUB-version korvaamiseksi on suositeltavaa muokata tiedostoa /boot/grub/menu.lst siten, että GRUB 2 ladataan olemassa olevista vanhoista GRUB-asetuksista. Tämä voidaan tehdä automaattisesti nyt." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "It's recommended that you accept chainloading GRUB 2 from menu.lst, and verify that your new GRUB 2 setup is functional for you, before you install it directly to your MBR (Master Boot Record)." +msgstr "On suositeltavaa, että hyväksyt GRUB 2:n ketjutetun lataamisen tiedostosta menu.lst ja varmistat, että uudet GRUB 2 -asetukset toimivat, ennen kuin asennat ne pääkäynnistyslohkoon (MBR)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "In either case, whenever you want GRUB 2 to be loaded directly from MBR, you can do so by issuing (as root) the following command:" +msgstr "Kun haluat asentaa GRUB 2:n latautumaan suoraan pääkäynnistyslohkosta, voit joka tapauksessa tehdä sen ajamalla pääkäyttäjänä seuraavan komennon:" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Linuxin komentorivi:" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "The following Linux command line was extracted from the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if necessary." +msgstr "GRUB Legacyn tiedoston menu.lst parametrista ”kopt” löydettiin seuraava Linuxin komentorivi. Varmista, että se on oikea ja muuta sitä tarvittaessa." + --- grub2-1.96+20080724.orig/debian/po/ta.po +++ grub2-1.96+20080724/debian/po/ta.po @@ -0,0 +1,126 @@ +# translation of grub2.po to TAMIL +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: grub2\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2007-03-05 17:08+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "GRUB 1.95 numbering scheme transition" +msgstr "க்ரப் 1.95 பகிர்வு எண் அளிப்பதில் பாங்கு மாற்றம்." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"வடிவமைப்பு 1.95 முதல் க்ரப் 2 எண் அளிப்பதில் மாற்றம் செய்துள்ளது. இப்போது பகிர்வுகள் 1 " +"முதல் எண்ணப் படும். 0 லிருந்து அல்ல. இது லீனக்ஸ் சாதன பெயர்களுடன் இசைவுள்ளது. " +"வினியோகத்தில் உள்ள மற்ற உட்கூறுகளுடனும் இசைவுள்ளது. உதாரணமாக லீனக்ஸ் ஐ உட்கூறாக பயன் " +"படுத்தும் போது \"(hd0,1)\" என்பது /dev/sda1 சாதன கணு குறிப்பதையே தான் குறிக்கிறது." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"இதனால் கணினியை துவக்கமுடியாமல் போகும் வாய்ப்பு உள்ளதால்: க்ரப் ஐ இற்றைப் படுத்தும் முன் " +"update-grub(8) ஐ இயக்கினால் அது ஒரு grub.cfg கோப்பை உருவாக்கும். ஆனால் அதை க்ரப் " +"சரியாக அலகிட முடியாது. ஆகவே கணினி துவக்கப் படுவதை உறுதி செய்ய நீங்கள் இதை செய்ய " +"வேண்டும்:" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +#, fuzzy +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - க்ரப் ஐ மீண்டும் நிறுவ வேண்டும். வழக்கமாக grub-install கட்டளை மூலம்.\n" +" - update-grub கட்டளையை இயக்கி புதிய grub.cfg ஐ உருவாக்க வைக்க வேண்டும்." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" --- grub2-1.96+20080724.orig/debian/po/templates.pot +++ grub2-1.96+20080724/debian/po/templates.pot @@ -0,0 +1,112 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" --- grub2-1.96+20080724.orig/debian/po/fr.po +++ grub2-1.96+20080724/debian/po/fr.po @@ -0,0 +1,139 @@ +# Translation of grub2 debconf templates to French +# Copyright (C) 2008 Christian Perrier +# This file is distributed under the same license as the grub2 package. +# +# Christian Perrier , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: fr\n" +"Report-Msgid-Bugs-To: pkg-grub-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2008-10-26 18:22+0100\n" +"PO-Revision-Date: 2008-10-27 19:19+0100\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "GRUB 1.95 numbering scheme transition" +msgstr "Changement de numérotation dans GRUB 1.95" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"As of version 1.95, GRUB 2 has changed its numbering scheme. Partitions are " +"now counted starting from 1 rather than 0. This is to make it consistent " +"with device names of Linux and the other kernels used in Debian. For " +"example, when using Linux as the kernel, \"(hd0,1)\" refers to the same " +"partition as the /dev/sda1 device node." +msgstr "" +"À partir de la version 1.95, GRUB 2 a modifié son système de numérotation. " +"La numérotation des partitions commence désormais à 1 et non à 0. Cette " +"méthode est en cohérence avec les noms de périphériques de Linux et des " +"autres noyaux utilisés dans la distribution. Par exemple, avec un noyau " +"Linux, « (hd0,1) » fait référence à la même partition que /dev/sda1." + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +"Because of this, there's a chance your system becomes unbootable if update-" +"grub(8) is run before GRUB is updated, generating a grub.cfg file that your " +"installed GRUB won't yet be able to parse correctly. To ensure your system " +"will be able to boot, you have to:" +msgstr "" +"En raison de ces changements, il est possible que le système ne puisse plus " +"démarrer si la commande update-grub(8) est exécutée avant la mise à jour de " +"GRUB. Cela créerait un fichier grub.cfg que la version installée de GRUB ne " +"pourrait pas analyser correctement. Pour garantir que le système pourra " +"toujours démarrer, vous devez :" + +#. Type: note +#. Description +#: ../grub2.templates:1001 +msgid "" +" - Reinstall GRUB (typically, by running grub-install).\n" +" - Rerun update-grub to generate a new grub.cfg." +msgstr "" +" - Réinstaller GRUB (avec la commande « grub-install ») ;\n" +" - Exécuter à nouveau la commande « update-grub » pour créer un nouveau\n" +" fichier grub.cfg." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "Chainload from menu.lst?" +msgstr "Faut-il enchaîner le chargement depuis menu.lst ?" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub." +msgstr "Une installation standard de GRUB a été détectée dans /boot/grub." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In order to replace the Legacy version of GRUB in your system, it is " +"recommended that /boot/grub/menu.lst is adjusted to chainload GRUB 2 from " +"your existing GRUB Legacy setup. This step may be automaticaly performed " +"now." +msgstr "" +"Afin de remplacer cette installation, il est recommandé de modifier /boot/" +"grub/menu.lst pour enchaîner le chargement de GRUB 2 depuis l'installation " +"standard de GRUB (« chainload »). Veuillez choisir si vous souhaitez " +"effectuer cette modification." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"It's recommended that you accept chainloading GRUB 2 from menu.lst, and " +"verify that your new GRUB 2 setup is functional for you, before you install " +"it directly to your MBR (Master Boot Record)." +msgstr "" +"Il est recommandé de choisir cette option pour pouvoir confirmer le bon " +"fonctionnement de GRUB 2 avant de l'installer directement sur le secteur " +"d'amorçage (MBR : « Master Boot Record »)." + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "" +"In either case, whenever you want GRUB 2 to be loaded directly from MBR, you " +"can do so by issuing (as root) the following command:" +msgstr "" +"Dans tous les cas, pour charger GRUB 2 directement depuis le secteur " +"d'amorçage, vous devrez utiliser la commande suivante avec les privilèges du " +"superutilisateur :" + +#. Type: boolean +#. Description +#: ../grub-pc.templates:1001 +msgid "upgrade-from-grub-legacy" +msgstr "upgrade-from-grub-legacy" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "Linux command line:" +msgstr "Ligne de commande de Linux :" + +#. Type: string +#. Description +#: ../grub-pc.templates:2001 +msgid "" +"The following Linux command line was extracted from the `kopt' parameter in " +"GRUB Legacy's menu.lst. Please verify that it is correct, and modify it if " +"necessary." +msgstr "" +"La ligne de commande de Linux suivante a été récupérée via le paramètre " +"« kopt » du fichier menu.lst normal de GRUB. Veuillez contrôler qu'elle est " +"correcte et la modifier si nécessaire." +