[Tollef Fog Heen] >> And this is not something for woody, so we'd better commit something >> like that later (even if it has no influence yet). > > true.
Agreed. We use it on our Woody CDs, as we use debian-installer for installation, but it have no utility with the current boot-floppies installation. Here is an updated and more tested patch. This time with documentation about two new options. Index: CONF.sh =================================================================== RCS file: /cvs/debian-boot/debian-cd/CONF.sh,v retrieving revision 1.27 diff -u -3 -p -u -r1.27 CONF.sh --- CONF.sh 2002/05/06 17:19:05 1.27 +++ CONF.sh 2002/06/28 10:57:27 @@ -180,3 +180,11 @@ export PUBLISH_URL="http://cdimage.debia export PUBLISH_NONUS_URL="http://non-US.cdimage.debian.org/jigdo-area"; export PUBLISH_PATH="/home/jigdo-area/" +# File with list of packages to include when running debootstrap from +# the first stage installer. One package per line. Lines starting +# with '#' are comments. The package order is important, when will be +# installed in the given order. +#export BASE_INCLUDE="$BASEDIR"/data/woody/base_include + +# File with list of packages to exclude as above. +#export BASE_EXCLUDE="$BASEDIR"/data/woody/base_exclude Index: Makefile =================================================================== RCS file: /cvs/debian-boot/debian-cd/Makefile,v retrieving revision 1.59 diff -u -3 -p -u -r1.59 Makefile --- Makefile 2002/06/25 13:42:23 1.59 +++ Makefile 2002/06/28 10:57:27 @@ -477,6 +477,29 @@ $(BDIR)/packages-stamp: dir=$(BDIR)/CD$$dir; \ $(scanpackages) install $$dir; \ done + $(Q)for DISK in $(FIRSTDISKS); do \ + DISK=$${DISK##CD}; \ + echo 'main' > $(BDIR)/CD$$DISK/.disk/base_components; \ + if [ -n "$(LOCAL)" ]; then \ + echo 'local' >> $(BDIR)/CD$$DISK/.disk/base_components; \ + fi; \ + if [ -n "$(BASE_INCLUDE)" ] ; then \ + if [ -r "$(BASE_INCLUDE)" ] ; then \ + cp -af "$(BASE_INCLUDE)" \ + "$(BDIR)/CD$$DISK/.disk/base_include"; \ + else \ + echo "ERROR: Unable to read BASE_INCLUDE file $(BASE_INCLUDE)"; \ + fi; \ + fi; \ + if [ -n "$(BASE_EXCLUDE)" ] ; then \ + if [ -r "$(BASE_EXCLUDE)" ] ; then \ + cp -af $(BASE_EXCLUDE) \ + $(BDIR)/CD$$DISK/.disk/base_exclude; \ + else \ + echo "ERROR: Unable to read BASE_EXCLUDE file $(BASE_EXCLUDE)"; \ + fi; \ + fi; \ + done $(Q)touch $(BDIR)/packages-stamp sources: src-infos src-list $(SDIR)/sources-stamp Index: debian/CONF.sh =================================================================== RCS file: /cvs/debian-boot/debian-cd/debian/CONF.sh,v retrieving revision 1.21 diff -u -3 -p -u -r1.21 CONF.sh --- debian/CONF.sh 2002/05/06 17:19:05 1.21 +++ debian/CONF.sh 2002/06/28 10:57:27 @@ -174,3 +174,12 @@ export DEFSRCSIZE=635 export PUBLISH_URL="http://cdimage.debian.org/jigdo-area"; export PUBLISH_NONUS_URL="http://non-US.cdimage.debian.org/jigdo-area"; export PUBLISH_PATH="/home/jigdo-area/" + +# File with list of packages to include when running debootstrap from +# the first stage installer. One package per line. Lines starting +# with '#' are comments. The package order is important, when will be +# installed in the given order. +#export BASE_INCLUDE="$BASEDIR"/data/woody/base_include + +# File with list of packages to exclude as above. +#export BASE_EXCLUDE="$BASEDIR"/data/woody/base_exclude -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
