Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a Xen variant on i386 and amd64 

Patch from Ian Campbell.

i386 Xen guests require a PAE (686-bigmem) kernel in order to
run. Therefore this variant includes the relevant installer kernel and
ramdisk in install.386/xen as well as suitable kernel udebs and proper
debs for the installed system.

amd64 Xen has no similar requirement but we include the kernels under
install.amd/xen in order to have a consistent path under both
architectures.
This commit is contained in:
Frans Pop 2009-08-09 14:33:00 +00:00
parent e9c608e6b7
commit fe2334131d
5 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/squeeze/exclude-udebs-i386
View File

@ -29,7 +29,7 @@ usb-serial-modules-*
usb-storage-modules-* usb-storage-modules-*
zlib-modules-* zlib-modules-*
# 686-bigmem kernel udebs are only used for the Xen netboot image # 686-bigmem kernel udebs are only used for the Xen netboot image
*-686-bigmem-di *-686-bigmem-di !xen
# Not used on i386 # Not used on i386
console-keymaps-acorn console-keymaps-acorn
console-keymaps-amiga console-keymaps-amiga

1
debian/changelog vendored
View File

@ -21,6 +21,7 @@ debian-cd (3.1.3) UNRELEASED; urgency=low
[ Ian Campbell ] [ Ian Campbell ]
* Add support for "variants". A variant allows to include/exclude additional * Add support for "variants". A variant allows to include/exclude additional
packages or D-I components relative to a regular image. packages or D-I components relative to a regular image.
* Add variant to create i386/amd64 images that support installing Xen guests.
-- Frans Pop <fjp@debian.org> Tue, 04 Aug 2009 22:32:08 +0200 -- Frans Pop <fjp@debian.org> Tue, 04 Aug 2009 22:32:08 +0200

7
docs/README.variants
View File

@ -12,6 +12,13 @@ option (multiple times if desired) to the easy-build.sh script.
Available Variants Available Variants
------------------ ------------------
* `xen' [i386, amd64 only]
This variant includes a kernel and installer initrd which is
compatible with the Xen hypervisor in `install.<arch>/xen' and
includes matching kernel module .udebs as well as a suitable kernel
.deb for installation into the final system.
Implementation Implementation
-------------- --------------

6
tools/boot/squeeze/boot-x86
View File

@ -238,6 +238,12 @@ if [ "$THISTYPE" = "isolinux" ]; then
fi fi
rm -f boot$N/isolinux/isolinux.cfg.with* rm -f boot$N/isolinux/isolinux.cfg.with*
if variant_enabled "xen" ; then
extra_image xen/vmlinuz
extra_image xen/initrd.gz
extra_image xen/xm-debian.cfg
fi
# Modify win32-loader.ini for the "current" arch # Modify win32-loader.ini for the "current" arch
if [ -e boot$N/win32-loader.ini ]; then if [ -e boot$N/win32-loader.ini ]; then
sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini

8
tools/generate_di+k_list
View File

@ -124,6 +124,14 @@ atl2-modules-2.6-486
atl2-modules-2.6-686 atl2-modules-2.6-686
speakup-modules-2.6-486 speakup-modules-2.6-486
speakup-modules-2.6-686 speakup-modules-2.6-686
#ifdef VARIANT_xen
linux-image-2.6-686-bigmem
linux-headers-2.6-686-bigmem
loop-aes-modules-2.6-686-bigmem
atl2-modules-2.6-686-bigmem
speakup-modules-2.6-686-bigmem
#endif
#endif #endif
#ifdef ARCH_amd64 #ifdef ARCH_amd64