Hi, I'd quite like to rename the xm-debian.cfg shipped by d-i to just debian.cfg. The "xm" came from the previous Xen toolstack's (xend) cli name, the modern one is called "xl". (it all seems a bit like pedantry, but, you know...) It's slightly tricky due to the need to change both d-i and the debian-cd stuff. IIRC the daily/weekly CD builds are made using the daily installer builds and therefore all that is needed is to check the two changes in at (roughly) the same time. Or do I need to worry about non-daily/weekly builds too? I suppose that if an alpha/beta release is made there will necessarily be a d-i upload first (with this change)? Patches to both are attached, I can checkin the d-i one myself if debian-cd are happy with the approach. Ian. -- Ian Campbell "It's ten o'clock... Do you know where your AI programs are?" -- Peter Oakley
From 0a221313303a0037078d72b6306dc256babe7098 Mon Sep 17 00:00:00 2001 From: Ian Campbell <ijc@hellion.org.uk> Date: Mon, 15 Aug 2011 08:31:17 +0100 Subject: [PATCH] xm-debian.cfg is now debian.cfg --- tools/boot/squeeze/boot-x86 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86 index b772027..4c34919 100644 --- a/tools/boot/squeeze/boot-x86 +++ b/tools/boot/squeeze/boot-x86 @@ -253,7 +253,7 @@ rm -f boot$N/isolinux/isolinux.cfg.with* if variant_enabled "xen" ; then extra_image xen/vmlinuz "../vmlinuz ../gtk/vmlinuz" extra_image xen/initrd.gz "../initrd.gz ../gtk/initrd.gz" - extra_image xen/xm-debian.cfg + extra_image xen/debian.cfg fi # Modify win32-loader.ini for the "current" arch -- 1.7.5.4
From 70329aad5f27ae32aa147b3ddc68ea478716e99d Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Thu, 28 Jul 2011 18:16:37 +0100
Subject: [PATCH] xen: Rename "xm-debian.cfg" to just "debian.cfg"
"xm" is a reference to the xend based toolstack but this file also works with
the new "xl" toolstack.
---
build/boot/x86/xen/{xm-debian.cfg => debian.cfg} | 0
build/config/x86.cfg | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename build/boot/x86/xen/{xm-debian.cfg => debian.cfg} (100%)
diff --git a/build/boot/x86/xen/xm-debian.cfg b/build/boot/x86/xen/debian.cfg
similarity index 100%
rename from build/boot/x86/xen/xm-debian.cfg
rename to build/boot/x86/xen/debian.cfg
diff --git a/build/config/x86.cfg b/build/config/x86.cfg
index 39b4a1c..a593185 100644
--- a/build/config/x86.cfg
+++ b/build/config/x86.cfg
@@ -17,7 +17,7 @@ SPLASH_PNG=boot/common/pics/spacefun-isolinux.png
BOOT_SCREEN_DIR =
# Location for Xen example configuration.
-XENCFG = $(SOME_DEST)/$(EXTRANAME)xm-debian.cfg
+XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
# Create syslinux config.
.PHONY: x86_syslinux
@@ -342,7 +342,7 @@ xen_config:
sed -e "s/@ARCH@/$(ARCH)/g" \
-e "s/@XEN_INSTALL_METHOD@/$(XEN_INSTALL_METHOD)/g" \
-e "s/@DEBIAN_RELEASE@/$(DEBIAN_RELEASE)/g" \
- <boot/x86/xen/xm-debian.cfg >$(XENCFG)
+ <boot/x86/xen/debian.cfg >$(XENCFG)
chmod 644 $(XENCFG)
update-manifest $(XENCFG) $(MANIFEST-XENCFG)
--
1.7.5.4
Attachment:
signature.asc
Description: This is a digitally signed message part