Fetch the install system from DI_CODENAME
At the moment, the install system used by debian-cd is fetched using
$CODENAME as the selector. The $DI_CODENAME variable is on the other
hand used to select which udebs to fetch (debian-installer modules).
I believe this is slightly skewed, as we want to use the same
installation system as we use installation system udebs, and propose
this patch to change debian-cd to select the installation system using
the $DI_CODENAME value.
This make it possible to make woody based CDs using debian-installer
to install the system.
Here is the patch. It is slightly tested. I've built a debian-edu
test CD using it, but haven't checked the installation system
completely yet.
One need to change the task lists as well to make sure the d-i udebs
are listed as well.
OK to commit?
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-cd/Makefile,v
retrieving revision 1.93
diff -u -3 -p -u -r1.93 Makefile
--- Makefile 24 Jun 2004 09:41:22 -0000 1.93
+++ Makefile 29 Jun 2004 14:08:59 -0000
@@ -58,9 +58,9 @@ endif
ifndef HOOK
HOOK=$(BASEDIR)/tools/$(CODENAME).hook
endif
-ifneq "$(wildcard $(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH))" ""
+ifneq "$(wildcard $(MIRROR)/dists/$(DI_CODENAME)/main/disks-$(ARCH))" ""
ifndef BOOTDISKS
-export BOOTDISKS=$(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH)
+export BOOTDISKS=$(MIRROR)/dists/$(DI_CODENAME)/main/disks-$(ARCH)
endif
endif
ifndef DOJIGDO
@@ -624,10 +626,10 @@ $(BDIR)/bootable-stamp:
dir=$${file%%.packages}; \
n=$${dir##$(BDIR)/}; \
dir=$(BDIR)/CD$$n; \
- if [ -f $(BASEDIR)/tools/boot/$(CODENAME)/boot-$(ARCH) ]; then \
+ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) ]; then \
cd $(BDIR); \
- echo "Running tools/boot/$(CODENAME)/boot-$(ARCH) $$n $$dir" ; \
- $(BASEDIR)/tools/boot/$(CODENAME)/boot-$(ARCH) $$n $$dir; \
+ echo "Running tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir" ; \
+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir; \
else \
if [ "$${IGNORE_MISSING_BOOT_SCRIPT:-0}" = "0" ]; then \
echo "No script to make CDs bootable for $(ARCH) ..."; \
@@ -701,18 +703,18 @@ $(BDIR)/CD1/tools:
done
# Add the disks-arch directories if/where needed
-disks: ok bin-infos $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH)
-$(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
+disks: ok bin-infos $(BDIR)/CD1/dists/$(DI_CODENAME)/main/disks-$(ARCH)
+$(BDIR)/CD1/dists/$(DI_CODENAME)/main/disks-$(ARCH):
ifdef BOOTDISKS
@echo "Adding disks-$(ARCH) stuff ..."
$(Q)set -e; \
for DISK in $(FIRSTDISKS) ; do \
- mkdir -p $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) ; \
+ mkdir -p $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH) ; \
$(add_files) \
- $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
+ $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH) \
$(BOOTDISKS) . ; \
touch $(BDIR)/$$DISK/.disk/kernel_installable ; \
- cd $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH); \
+ cd $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH); \
rm -rf base-images-*; \
if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \
if [ -L current ]; then \
@@ -892,11 +894,11 @@ bin-images: ok bin-md5list $(OUT) $(TDIR
$(BINDISKINFOND) \
> $(TDIR)/$(CODENAME)-$(ARCH).jigdo; \
fi; \
- if [ "$(DOJIGDO)" != "2" -o -f $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) ]; then \
+ if [ "$(DOJIGDO)" != "2" -o -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-$(ARCH)-$$n.raw $$opts CD$$n ; \
- if [ -f $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) ]; then \
- $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) $$n $$dir \
+ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $$n $$dir \
$(OUT)/$(CODENAME)-$(ARCH)-$$n.raw; \
fi; \
if [ "$(DOJIGDO)" != "0" ]; then \
@@ -974,8 +976,8 @@ bin-image: ok bin-md5list $(OUT)
volid=`cat $(CD).volid`; rm -f $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw $$opts CD$(CD); \
- if [ -f $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) ]; then \
- $(BASEDIR)/tools/boot/$(CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
+ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
$(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \
fi
Index: build.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/build.sh,v
retrieving revision 1.10
diff -u -3 -p -u -r1.10 build.sh
--- build.sh 19 Jan 2003 15:00:38 -0000 1.10
+++ build.sh 29 Jun 2004 14:08:59 -0000
@@ -21,14 +24,14 @@ else
fi
fi
echo " ... selecting packages to include"
-if [ -e ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. ] ; then
- disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
+if [ -e ${MIRROR}/dists/${DI_CODENAME}/main/disks-${ARCH}/current/. ] ; then
+ disks=`du -sm ${MIRROR}/dists/${DI_CODENAME}/main/disks-${ARCH}/current/. | \
awk '{print $1}'`
else
disks=0
fi
-if [ -f $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc ]; then
- . $BASEDIR/tools/boot/$CODENAME/boot-$ARCH.calc
+if [ -f $BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH.calc ]; then
+ . $BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH.calc
fi
SIZE_ARGS=''
for CD in 1 2 3 4 5 6 7 8; do
Index: tools/boot/sarge/boot-alpha
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-alpha,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 boot-alpha
--- tools/boot/sarge/boot-alpha 18 Apr 2004 12:05:46 -0000 1.6
+++ tools/boot/sarge/boot-alpha 29 Jun 2004 14:08:59 -0000
@@ -18,7 +18,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/boot-hppa
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-hppa,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 boot-hppa
--- tools/boot/sarge/boot-hppa 14 Apr 2004 10:44:46 -0000 1.2
+++ tools/boot/sarge/boot-hppa 29 Jun 2004 14:08:59 -0000
@@ -7,7 +7,7 @@
# palo is used to make ISOs bootable on HPPA.
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/boot-i386
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-i386,v
retrieving revision 1.20
diff -u -3 -p -u -r1.20 boot-i386
--- tools/boot/sarge/boot-i386 26 Jun 2004 10:07:35 -0000 1.20
+++ tools/boot/sarge/boot-i386 29 Jun 2004 14:08:59 -0000
@@ -6,7 +6,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
@@ -66,7 +66,7 @@ done
if [ "$NN" = "1" ]; then
echo "Using ISOLINUX boot-disks image on CD$N"
mkdir -p boot$N/isolinux
- cp -f $BASEDIR/data/$CODENAME/isolinux.bin boot$N/isolinux/
+ cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
cp -lf cdrom/vmlinuz $CDDIR/install/
cp -lf cdrom/initrd.gz $CDDIR/install/
echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
@@ -99,10 +99,10 @@ done
# ISOLINUX setup
# Include Smart Boot Manager image for people where isolinux fails
-gzip -dc $BASEDIR/data/$CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
+gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
# Keep the original file timestamp
-touch -r $BASEDIR/data/$CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
-cp -p $BASEDIR/data/$CODENAME/README.sbm $CDDIR/install/
+touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
+cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
# Isolinux help files come from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt
@@ -123,7 +123,7 @@ if [ -e boot$N/isolinux/f3.txt.with26 ];
# Isolinux config file.
cat > boot$N/isolinux/isolinux.cfg <<EOF
DEFAULT /install/vmlinuz
-APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
+APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw DEBCONF_PRIORITY=critical
LABEL linux
kernel /install/vmlinuz
LABEL cdrom
Index: tools/boot/sarge/boot-ia64
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-ia64,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 boot-ia64
--- tools/boot/sarge/boot-ia64 14 Apr 2004 10:44:46 -0000 1.3
+++ tools/boot/sarge/boot-ia64 29 Jun 2004 14:08:59 -0000
@@ -5,7 +5,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
set -x
Index: tools/boot/sarge/boot-m68k
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-m68k,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 boot-m68k
--- tools/boot/sarge/boot-m68k 28 May 2004 18:05:05 -0000 1.6
+++ tools/boot/sarge/boot-m68k 29 Jun 2004 14:08:59 -0000
@@ -6,7 +6,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/boot-mips
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-mips,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 boot-mips
--- tools/boot/sarge/boot-mips 14 Apr 2004 10:44:46 -0000 1.1
+++ tools/boot/sarge/boot-mips 29 Jun 2004 14:08:59 -0000
@@ -7,7 +7,7 @@
# genisovh is used to make ISOs bootable on mips.
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/boot-mipsel
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-mipsel,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 boot-mipsel
--- tools/boot/sarge/boot-mipsel 7 Jun 2004 09:07:49 -0000 1.1
+++ tools/boot/sarge/boot-mipsel 29 Jun 2004 14:08:59 -0000
@@ -15,7 +15,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/boot-powerpc
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-powerpc,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 boot-powerpc
--- tools/boot/sarge/boot-powerpc 7 Jun 2004 09:35:40 -0000 1.6
+++ tools/boot/sarge/boot-powerpc 29 Jun 2004 14:08:59 -0000
@@ -6,7 +6,7 @@
# $1 is the CD number
# $2 is the temporary CD build dir
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/boot-sparc
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/boot-sparc,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 boot-sparc
--- tools/boot/sarge/boot-sparc 7 Jun 2004 09:35:40 -0000 1.3
+++ tools/boot/sarge/boot-sparc 29 Jun 2004 14:08:59 -0000
@@ -4,7 +4,7 @@
#
# Do install stuff for sparc, including making first CD bootable
-. $BASEDIR/tools/boot/$CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
set -e
Index: tools/boot/sarge/common.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/sarge/common.sh,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 common.sh
--- tools/boot/sarge/common.sh 10 Oct 2002 12:56:48 -0000 1.1
+++ tools/boot/sarge/common.sh 29 Jun 2004 14:08:59 -0000
@@ -8,11 +8,11 @@
# This function should be called for all bootable images.
install_languages() {
# Param $1 is the CD directory
- if [ -f "$MIRROR/dists/$CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
+ if [ -f "$MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
then
mkdir $1/.xlp
(cd $1/.xlp; \
- tar zxf $MIRROR/dists/$CODENAME/main/disks-$ARCH/current/xlp.tgz )
+ tar zxf $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz )
fi
}
Reply to: