diffstat for debian-installer-20101020 debian-installer-20112005 build/Makefile | 3 build/boot/hurd/grub-hurd-i386.cfg | 1 build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg | 1 build/boot/kfreebsd/grub-kfreebsd-pxe.cfg | 2 build/boot/x86/f1.txt | 6 - build/boot/x86/f10.txt | 6 - build/boot/x86/f2.txt | 10 +- build/boot/x86/f6.txt | 2 build/boot/x86/f9.txt | 4 - build/boot/x86/gtk.cfg | 4 - build/boot/x86/live.cfg | 6 + build/boot/x86/menu.cfg | 9 +- build/boot/x86/pics/boss.README | 6 + build/boot/x86/pics/boss.png |binary build/boot/x86/pics/boss.rle |binary build/boot/x86/pics/eduboss.README | 6 + build/boot/x86/pics/eduboss.png |binary build/boot/x86/pics/eduboss.rle |binary build/boot/x86/stdmenu.cfg | 6 - build/boot/x86/txt.cfg | 6 - build/config/common | 6 - build/config/x86.cfg | 4 - build/localudebs/choose-mirror-bin_2.35boss1_i386.udeb |binary build/localudebs/choose-mirror_2.35boss1_all.udeb |binary build/localudebs/localechooser_2.28boss2_i386.udeb |binary build/localudebs/localechooser_2.29boss2_i386.udeb |binary build/localudebs/main-menu_1.32boss1_i386.udeb |binary build/localudebs/main-menu_1.32boss2_i386.udeb |binary build/localudebs/netcfg-static_1.56boss1_i386.udeb |binary build/localudebs/netcfg_1.56boss1_i386.udeb |binary build/localudebs/rootskel-gtk_1.20_i386.udeb |binary build/localudebs/rootskel-gtk_1.20boss2_i386.udeb |binary build/util/geniso_hybrid_plus_firmware_partition | 62 ----------------- build/util/get-packages | 2 debian/changelog | 46 +++++++----- debian/control | 6 - debian/rules | 2 doc/devel/kerntabl | 23 +++--- 38 files changed, 93 insertions(+), 136 deletions(-) diff -Nru debian-installer-20101020/build/Makefile debian-installer-20112005/build/Makefile --- debian-installer-20101020/build/Makefile 2010-10-20 20:56:20.000000000 +0000 +++ debian-installer-20112005/build/Makefile 2010-09-05 17:19:09.000000000 +0000 @@ -601,8 +601,7 @@ sources.list.udeb: @(set -e; \ echo "# This file is automatically generated, edit $@.local instead."; \ - echo "# FIXME: localudebs disabled due #600852"; \ - echo "#deb copy:$(shell pwd)/ $(LOCALUDEBDIR)/"; \ + echo "deb copy:$(shell pwd)/ $(LOCALUDEBDIR)/"; \ if [ "$(MIRROR)x" != "x" ]; then \ echo "deb $(MIRROR) $(USE_UDEBS_FROM) $(UDEB_COMPONENTS)"; \ else \ diff -Nru debian-installer-20101020/build/boot/hurd/grub-hurd-i386.cfg debian-installer-20112005/build/boot/hurd/grub-hurd-i386.cfg --- debian-installer-20101020/build/boot/hurd/grub-hurd-i386.cfg 2010-09-18 18:10:52.000000000 +0000 +++ debian-installer-20112005/build/boot/hurd/grub-hurd-i386.cfg 2010-08-22 20:42:08.000000000 +0000 @@ -1,6 +1,5 @@ set cd=$root -set timeout=-1 if loadfont /boot/grub/font.pf2 ; then set gfxmode=640x480 diff -Nru debian-installer-20101020/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg debian-installer-20112005/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg --- debian-installer-20101020/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg 2010-09-18 18:10:52.000000000 +0000 +++ debian-installer-20112005/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg 2010-08-22 20:42:08.000000000 +0000 @@ -1,6 +1,5 @@ set cd=$root -set timeout=-1 if loadfont /boot/grub/font.pf2 ; then set gfxmode=640x480 diff -Nru debian-installer-20101020/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg debian-installer-20112005/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg --- debian-installer-20101020/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg 2010-09-18 18:10:52.000000000 +0000 +++ debian-installer-20112005/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg 2010-08-22 20:42:08.000000000 +0000 @@ -1,5 +1,3 @@ -set timeout=-1 - if loadfont $prefix/font.pf2 ; then set gfxmode=640x480 insmod vbe diff -Nru debian-installer-20101020/build/boot/x86/f1.txt debian-installer-20112005/build/boot/x86/f1.txt --- debian-installer-20101020/build/boot/x86/f1.txt 2008-10-27 10:43:21.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/f1.txt 2011-03-30 06:01:15.000000000 +0000 @@ -1,6 +1,6 @@ - 0fWelcome to Debian GNU/Linux!07 09F107 + 0fWelcome to EduBOSS GNU/Linux!07 09F107 -This is a Debian ${DEBIAN_VERSION} installation ${MEDIA_TYPE}. +This is a EduBOSS 2.0 installation ${MEDIA_TYPE}. It was built on ${BUILD_DATE}. 0fHELP INDEX07 @@ -8,7 +8,7 @@ 0fKEY TOPIC07 <09F107> This page, the help index. -<09F207> Prerequisites for installing Debian. +<09F207> Prerequisites for installing EduBOSS. <09F307> Boot methods for special ways of using this ${MEDIA_TYPE} <09F407> Additional boot methods; rescue mode. <09F507> Special boot parameters, overview. diff -Nru debian-installer-20101020/build/boot/x86/f10.txt debian-installer-20112005/build/boot/x86/f10.txt --- debian-installer-20101020/build/boot/x86/f10.txt 2009-01-10 16:12:13.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/f10.txt 2011-03-30 05:59:23.000000000 +0000 @@ -1,13 +1,11 @@  0fCOPYRIGHTS AND WARRANTIES07 09F1007 -Debian GNU/Linux is Copyright (C) 1993-2009 Software in the Public Interest, -and others. -The Debian GNU/Linux system is freely redistributable. After installation, +The EduBOSS GNU/Linux system is freely redistributable. After installation, the exact distribution terms for each package are described in the corresponding file /usr/share/doc/0bpackagename07/copyright. -Debian GNU/Linux comes with 0fABSOLUTELY NO WARRANTY07, to the extent +EduBOSS GNU/Linux comes with 0fABSOLUTELY NO WARRANTY07, to the extent permitted by applicable law. diff -Nru debian-installer-20101020/build/boot/x86/f2.txt debian-installer-20112005/build/boot/x86/f2.txt --- debian-installer-20101020/build/boot/x86/f2.txt 2008-11-18 03:17:33.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/f2.txt 2011-03-30 06:00:28.000000000 +0000 @@ -1,16 +1,16 @@ - 0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207 + 0fPREREQUISITES FOR INSTALLING EduBOSS07 09F207 -You must have at least 44 megabytes of RAM to use this Debian installer. +You must have at least 44 megabytes of RAM to use this EduBOSS installer. You should have space on your hard disk to create a new disk partition of at least 500 megabytes to install the base system. You'll need more disk space to install additional packages, depending on what you wish -to do with your new Debian system. +to do with your new EduBOSS system. See the Installation Guide or the FAQ for more information; both -documents are available at the Debian web site, 0fhttp://www.debian.org/07 +documents are available at the BOSS web site, 0fhttp://www.bosslinux.in/07 -Thank you for choosing Debian! +Thank you for choosing EduBOSS! diff -Nru debian-installer-20101020/build/boot/x86/f6.txt debian-installer-20112005/build/boot/x86/f6.txt --- debian-installer-20101020/build/boot/x86/f6.txt 2010-10-18 23:14:56.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/f6.txt 2010-09-03 11:03:06.000000000 +0000 @@ -10,7 +10,7 @@ Protect I/O port regions 0freserve=0biobase0f,0bextent07[0f,0b...07] Laptops with screen display problems 0fvga=77107 Use first serial port at 9600 baud 0fconsole=ttyS0,9600n807 -Force use of generic IDE driver 0fall_generic_ide=107 +Force use of generic IDE driver 0fgeneric.all_generic_ide=107 Possible (temporary) workarounds for lockups or other hardware failures: disable buggy APIC interrupt routing 0fnoapic nolapic07 (partly) disable ACPI 0facpi=noirq07 or 0facpi=off07 diff -Nru debian-installer-20101020/build/boot/x86/f9.txt debian-installer-20112005/build/boot/x86/f9.txt --- debian-installer-20101020/build/boot/x86/f9.txt 2008-11-18 03:17:33.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/f9.txt 2011-03-30 06:02:10.000000000 +0000 @@ -1,6 +1,6 @@  0fGETTING HELP07 09F907 -If you can't install Debian, don't despair! The Debian team is ready to +If you can't install EduBOSS, don't despair! The EduBOSS team is ready to help you! We are especially interested in hearing about installation problems, because in general they don't happen to only 0fone07 person. We've either already heard about your particular problem and can dispense a @@ -9,7 +9,7 @@ experience! See the Installation Guide or the FAQ for more information; both -documents are available at the Debian web site, 0fhttp://www.debian.org/07 +documents are available at the BOSS web site, 0fhttp://www.bosslinux.in/07 diff -Nru debian-installer-20101020/build/boot/x86/gtk.cfg debian-installer-20112005/build/boot/x86/gtk.cfg --- debian-installer-20101020/build/boot/x86/gtk.cfg 2009-06-07 17:27:36.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/gtk.cfg 2011-02-03 01:33:36.000000000 +0000 @@ -1,4 +1,4 @@ label installgui - menu label ^Graphical install + menu label Install EduBOSS - Graphical kernel ${KERNEL} - append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE} + append preseed/file=/cdrom/eduboss-preseed.cfg desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE} diff -Nru debian-installer-20101020/build/boot/x86/live.cfg debian-installer-20112005/build/boot/x86/live.cfg --- debian-installer-20101020/build/boot/x86/live.cfg 1970-01-01 00:00:00.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/live.cfg 2011-03-30 06:01:54.000000000 +0000 @@ -0,0 +1,6 @@ +default live +label live + menu label Start EduBOSS Live + menu default + kernel /live/vmlinuz + append ramdisk_size=100000 root=/dev/ram0 initrd=/live/initrd.gz boot=live ro vga=791 splash quiet pci=nommconf iommu=calgary diff -Nru debian-installer-20101020/build/boot/x86/menu.cfg debian-installer-20112005/build/boot/x86/menu.cfg --- debian-installer-20101020/build/boot/x86/menu.cfg 2009-06-07 17:27:36.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/menu.cfg 2011-02-23 06:43:06.000000000 +0000 @@ -3,15 +3,16 @@ menu title Installer boot menu${BEEP} include ${SYSDIR}stdmenu.cfg -include ${SYSDIR}txt.cfg -include ${SYSDIR}amdtxt.cfg +include ${SYSDIR}live.cfg include ${SYSDIR}gtk.cfg include ${SYSDIR}amdgtk.cfg +include ${SYSDIR}txt.cfg +include ${SYSDIR}amdtxt.cfg menu begin advanced menu title Advanced options include ${SYSDIR}stdmenu.cfg label mainmenu - menu label ^Back.. + menu label Back.. menu exit include ${SYSDIR}adtxt.cfg include ${SYSDIR}amdadtxt.cfg @@ -20,7 +21,7 @@ include ${SYSDIR}dtmenu.cfg menu end label help - menu label ^Help + menu label Help text help Display help screens; type 'menu' at boot prompt to return to this menu endtext diff -Nru debian-installer-20101020/build/boot/x86/pics/boss.README debian-installer-20112005/build/boot/x86/pics/boss.README --- debian-installer-20101020/build/boot/x86/pics/boss.README 1970-01-01 00:00:00.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/pics/boss.README 2010-09-03 11:03:06.000000000 +0000 @@ -0,0 +1,6 @@ +To create boss.rle: + + 1. convert boss.png boss.bmp + 2. bmptoppm < boss.bmp | ppmtolss16 #FBFDFA=7 > boss.rle + + (FBFDFA is the color used for the inside of the "n" in Boss.) Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/boot/x86/pics/boss.png and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/boot/x86/pics/boss.png differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/boot/x86/pics/boss.rle and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/boot/x86/pics/boss.rle differ diff -Nru debian-installer-20101020/build/boot/x86/pics/eduboss.README debian-installer-20112005/build/boot/x86/pics/eduboss.README --- debian-installer-20101020/build/boot/x86/pics/eduboss.README 1970-01-01 00:00:00.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/pics/eduboss.README 2011-02-09 09:42:56.000000000 +0000 @@ -0,0 +1,6 @@ +To create eduboss.rle: + + 1. convert eduboss.png eduboss.bmp + 2. bmptoppm < eduboss.bmp | ppmtolss16 "#FBFDFA=7" > eduboss.rle + + (FBFDFA is the color used for the inside of the "n" in EduBOSS.) Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/boot/x86/pics/eduboss.png and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/boot/x86/pics/eduboss.png differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/boot/x86/pics/eduboss.rle and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/boot/x86/pics/eduboss.rle differ diff -Nru debian-installer-20101020/build/boot/x86/stdmenu.cfg debian-installer-20112005/build/boot/x86/stdmenu.cfg --- debian-installer-20101020/build/boot/x86/stdmenu.cfg 2008-11-29 11:10:56.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/stdmenu.cfg 2010-09-22 07:43:23.000000000 +0000 @@ -1,10 +1,10 @@ menu background ${SYSDIR}splash.png menu color title * #FFFFFFFF * menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * +menu color sel * #ff000000 #76a1d0ff * menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none +menu color tabmsg * #ffff00ff #00000000 * +menu color help 37;40 #ff000000 #00000000 none menu vshift 12 menu rows 10 menu helpmsgrow 15 diff -Nru debian-installer-20101020/build/boot/x86/txt.cfg debian-installer-20112005/build/boot/x86/txt.cfg --- debian-installer-20101020/build/boot/x86/txt.cfg 2009-06-07 17:27:36.000000000 +0000 +++ debian-installer-20112005/build/boot/x86/txt.cfg 2011-02-03 01:33:57.000000000 +0000 @@ -1,6 +1,4 @@ -default install label install - menu label ^Install - menu default + menu label Install EduBOSS - Text mode kernel ${KERNEL} - append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE} + append preseed/file=/cdrom/eduboss-preseed.cfg desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE} diff -Nru debian-installer-20101020/build/config/common debian-installer-20112005/build/config/common --- debian-installer-20101020/build/config/common 2010-02-20 16:43:06.000000000 +0000 +++ debian-installer-20112005/build/config/common 2010-11-03 07:39:36.000000000 +0000 @@ -37,13 +37,13 @@ DPKG_UNPACK_OPTIONS = --force-overwrite # The codename of the Debian release that should be installed by default. -DEBIAN_RELEASE = squeeze +DEBIAN_RELEASE = savir # The version (number and codename) of the Debian release targeted by the # installation images. (Only the codename is used while the version number # has not yet been determined.) -DEBIAN_VERSION = 6.0 (squeeze) -DEBIAN_VERSION ?= squeeze +DEBIAN_VERSION = 6.0 (savir) +DEBIAN_VERSION ?= savir # Define here from what release (codename!) components (udebs) should be taken # to build debian-installer. By default this is set to 'unstable' for building diff -Nru debian-installer-20101020/build/config/x86.cfg debian-installer-20112005/build/config/x86.cfg --- debian-installer-20101020/build/config/x86.cfg 2010-09-16 19:07:00.000000000 +0000 +++ debian-installer-20112005/build/config/x86.cfg 2011-02-09 09:54:54.000000000 +0000 @@ -11,7 +11,7 @@ DOS_VOLUME_LABEL = "Debian Inst" # The image to use for a syslinux splash screen. -SPLASH_PNG=boot/x86/pics/klowner.png +SPLASH_PNG=boot/x86/pics/eduboss.png # The directory boot screens for syslinux will go in. BOOT_SCREEN_DIR = @@ -278,8 +278,6 @@ genisoimage -r -J -b isolinux.bin -c boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ -o $(TEMP_MINIISO) $(TEMP_CD_TREE) - - geniso_hybrid_plus_firmware_partition $(TEMP_MINIISO) # Netboot files .PHONY: arch_netboot_dir Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/choose-mirror-bin_2.35boss1_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/choose-mirror-bin_2.35boss1_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/choose-mirror_2.35boss1_all.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/choose-mirror_2.35boss1_all.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/localechooser_2.28boss2_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/localechooser_2.28boss2_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/localechooser_2.29boss2_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/localechooser_2.29boss2_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/main-menu_1.32boss1_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/main-menu_1.32boss1_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/main-menu_1.32boss2_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/main-menu_1.32boss2_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/netcfg-static_1.56boss1_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/netcfg-static_1.56boss1_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/netcfg_1.56boss1_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/netcfg_1.56boss1_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/rootskel-gtk_1.20_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/rootskel-gtk_1.20_i386.udeb differ Binary files /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/UcLnPTtmyA/debian-installer-20101020/build/localudebs/rootskel-gtk_1.20boss2_i386.udeb and /tmp/derivs-cmp-srcpkg-BOSSlinux-bc5a7p3a/Y1giTMGWYe/debian-installer-20112005/build/localudebs/rootskel-gtk_1.20boss2_i386.udeb differ diff -Nru debian-installer-20101020/build/util/geniso_hybrid_plus_firmware_partition debian-installer-20112005/build/util/geniso_hybrid_plus_firmware_partition --- debian-installer-20101020/build/util/geniso_hybrid_plus_firmware_partition 2010-09-16 19:07:07.000000000 +0000 +++ debian-installer-20112005/build/util/geniso_hybrid_plus_firmware_partition 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -#!/bin/sh -# Given an iso image, runs isohybrid on it to allow it to be booted from -# USB stick as well as CD. Then it adds a small second FAT partition, which -# the user can use to provide firmware files to the installer on the same -# USB stick. - -# This needs to be big enough to hold the uncompressed firmware.tar.gz -# file. Currently that is 4.4M; add a few more to grow. -firmware_volume_size_M=6 -# max size 11 chars: ----------- -firmware_volume_name="Firmware" - -iso="$1" - -if [ -z "$iso" ]; then - echo "usage: $0 iso" >&2 - exit 1 -fi - -set -e - -isohybrid "$iso" - -# Make the firmware volume. -tmpdir="$(mktemp -d)" -firmware_volume_file="$tmpdir/fat" -mkfs.msdos -n "$firmware_volume_name" -C "$firmware_volume_file" \ - $(expr $firmware_volume_size_M \* 1024) - -# Combine images. -# XXX This wastes some space because isohybrid pads the iso to one -# megabyte. Could reuse that padding for the start of the firmware volume. -cat "$firmware_volume_file" >> "$iso" -rm -r "$tmpdir" - -# Now adjust the partition table of the hybrid iso. -# It has a first partition which is the iso; add a second partition for the -# firmware volume. -( - -# Go into extended menu and set cylinders to 32. -# This is the same number of cylinders (currently) used by isohybrid. -echo x -echo c -echo 32 -echo r - -# Make new partition #2 -echo n -echo p -echo 2 -echo -echo +"$firmware_volume_size_M"M - -# Pedantically, set partition type to 1: FAT 16 -echo t -echo 2 -echo 1 - -# Done! -echo w -) | fdisk "$iso" diff -Nru debian-installer-20101020/build/util/get-packages debian-installer-20112005/build/util/get-packages --- debian-installer-20101020/build/util/get-packages 2010-09-04 22:16:15.000000000 +0000 +++ debian-installer-20112005/build/util/get-packages 2010-09-22 05:13:57.000000000 +0000 @@ -175,7 +175,7 @@ else echo Need to download: $PACKAGES if [ -n "$PACKAGES" ]; then - $APT_GET -dy install $PACKAGES + $APT_GET -dy --force-yes install $PACKAGES fi fi diff -Nru debian-installer-20101020/debian/changelog debian-installer-20112005/debian/changelog --- debian-installer-20101020/debian/changelog 2010-10-20 20:56:41.000000000 +0000 +++ debian-installer-20112005/debian/changelog 2011-05-20 06:00:35.000000000 +0000 @@ -1,23 +1,33 @@ -debian-installer (20101020) unstable; urgency=low +debian-installer (20112005) savir; urgency=low - [ Joey Hess ] - * Run isohybrid on i386 and amd64 miniiso, which allows it to be written - directly to and booted from a USB stick. - - [ Samuel Thibault ] - * Explicitly set timeout to -1 in grub configurations, to make it easy to - set it to 0 for preseeding. - - [ Otavio Salvador ] - * Update Linux kernel modules for 2.6.32-25. - * Fix parameter used to force generic IDE driver. Thanks to Rafael - rafuch0 Rumbos S by reporting it. - Closes: #599041. - * Disable localudebs usage due APT bug #600852. This has been done to - not delay Beta1 release but needs to be reverted as soon as - possible. + * build/localudebs: + - Added choose-mirror and choose-mirror-bin - -- Otavio Salvador Wed, 20 Oct 2010 18:56:41 -0200 + -- Prathibha B Fri, 20 May 2011 11:30:33 +0530 + +debian-installer (20110209) savir; urgency=low + + * build/boot/x86/pics: + - Added eduboss.png, eduboss.README. + - Created eduboss.rle using the commands given in eduboss.README file. + * build/config: + - Changed the splash image path in x86.cfg file. + + -- Prathibha B Wed, 09 Feb 2011 15:17:51 +0530 + +debian-installer (20101102) stable; urgency=low + + * Recompiled for BOSS + + -- Prema S Tue, 02 Nov 2010 11:16:50 +0530 + +debian-installer (20101020) stable; urgency=low + + * Added boss.png as default bootsplash image. + * Updated F1-F8 help pages for BOSS release + * Added live.cfg for Live session + + -- Prema S Wed, 20 Oct 2010 10:16:50 +0530 debian-installer (20100912) unstable; urgency=low diff -Nru debian-installer-20101020/debian/control debian-installer-20112005/debian/control --- debian-installer-20101020/debian/control 2010-09-16 19:07:07.000000000 +0000 +++ debian-installer-20112005/debian/control 2010-08-29 19:54:37.000000000 +0000 @@ -7,7 +7,7 @@ Vcs-Svn: svn://svn.debian.org/d-i/trunk/installer Build-Conflicts: libnewt-pic [mipsel] # NOTE: Do not edit the next line by hand. See comment below. -Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, debian-archive-keyring (>= 2006.11.22), dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools [i386 ia64 m68k amd64], cpio, devio [armeb armel], slugimage (>= 0.10+r58-6) [armeb armel], dns323-firmware-tools [armel], uboot-mkimage [armel], syslinux (>= 2:4.02) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [armeb armel], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386], module-init-tools [i386 armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl [armel], win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386], makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386], debian-ports-archive-keyring [sh4 sparc64] +Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, debian-archive-keyring (>= 2006.11.22), dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools [i386 ia64 m68k amd64], cpio, devio [armeb armel], slugimage (>= 0.10+r58-6) [armeb armel], dns323-firmware-tools [armel], uboot-mkimage [armel], syslinux (>= 2:3.63+dfsg-2) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [armeb armel], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386], module-init-tools [i386 armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl [armel], win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386], makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386], debian-ports-archive-keyring [sh4 sparc64] # This package has the worst Build-Depends in Debian, so it deserves some # explanation. Note that this comment can also be used to generate a # Build-Depends line, by running the debian/genbuilddeps program. @@ -99,8 +99,8 @@ # On many arches boot loaders are copied onto or ran on the boot # images in one way or another. There's a reason our mailing list is # still called debian-boot.. -# - syslinux (>= 2:4.02) [i386 amd64] -# With isohybrid. +# - syslinux (>= 2:3.63+dfsg-2) [i386 amd64] +# With menu default64 support. # - palo [hppa] # - elilo [ia64] # - yaboot [powerpc] diff -Nru debian-installer-20101020/debian/rules debian-installer-20112005/debian/rules --- debian-installer-20101020/debian/rules 2010-01-22 19:28:45.000000000 +0000 +++ debian-installer-20112005/debian/rules 2010-09-22 05:05:29.000000000 +0000 @@ -9,7 +9,7 @@ TRANSSTATUS= BOOTMENU_BEEP=n else -USE_UDEBS_FROM=squeeze +USE_UDEBS_FROM=savir USE_PROPOSED_UPDATES=0 TRANSSTATUS=translation-status BOOTMENU_BEEP=y diff -Nru debian-installer-20101020/doc/devel/kerntabl debian-installer-20112005/doc/devel/kerntabl --- debian-installer-20101020/doc/devel/kerntabl 2010-10-20 12:40:41.000000000 +0000 +++ debian-installer-20112005/doc/devel/kerntabl 2010-06-26 17:56:00.000000000 +0000 @@ -6,19 +6,20 @@ kernel debs that are hardcoded into base-installer, and the kernels that are put on CDs. All of these have to be coordinated for a d-i release. -The numbers between brackets are the package version for linux-2.6. +The numbers between brackets are the package version for linux-2.6 and +linux-modules-extra-2.6 respectively. arch kernel udebs build/config -i386 2.6.32 (-25) 2.6.32-5 -amd64 2.6.32 (-25) 2.6.32-5 -armel 2.6.32 (-25) 2.6.32-5 -hppa 2.6.32 (-25) 2.6.32-5 -ia64 2.6.32 (-25) 2.6.32-5 -mips 2.6.32 (-25) 2.6.32-5 -mipsel 2.6.32 (-25) 2.6.32-5 -powerpc 2.6.32 (-25) 2.6.32-5 -s390 2.6.32 (-25) 2.6.32-5 -sparc 2.6.32 (-25) 2.6.32-5 +i386 2.6.32 (-15) 2.6.32-5 +amd64 2.6.32 (-15) 2.6.32-5 +armel 2.6.32 (-15) 2.6.32-5 +hppa 2.6.32 (-15) 2.6.32-5 +ia64 2.6.32 (-15) 2.6.32-5 +mips 2.6.32 (-15) 2.6.32-5 +mipsel 2.6.32 (-15) 2.6.32-5 +powerpc 2.6.32 (-15) 2.6.32-5 +s390 2.6.32 (-15) 2.6.32-5 +sparc 2.6.32 (-15) 2.6.32-5 alpha 2.6.30 (-6) 2.6.30-1 # unoficial m68k 2.6.26 (-7) 2.6.26-1 # unoficial