Re: localising base-config - end game

[Petter Reinholdtsen <pere@hungry.com>]

[Petter Reinholdtsen]
> The following patch should do the job, assuming the debconf and
> locales package is available.

Here is a new one, without debconf.  If the CD is built using the
standard debian-cd package, the locales package will be available.  It
is in section base and priority standard.  Both are automatically
included on CD 1.  Of course, this might be a problem when using the
base tar.gz file.

Index: extract_base.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/extract_base.c,v
retrieving revision 1.75
diff -u -3 -p -u -r1.75 extract_base.c
--- extract_base.c      2002/03/14 18:53:39     1.75
+++ extract_base.c      2002/03/17 09:33:10
@@ -249,11 +249,12 @@ exec_debootstrap(char **argv){
 int
 debootstrap_extract_base (void) {
   int rs=0;
-  char *argv[8];
+  char *argv[9];
   struct stat statbuf;
   char *source;
   char filename [512];
   int status;
+  int argnum;

   /* Sanity Check */
   if (NAME_ISREG ("/target/etc/debian_version", &statbuf)) {
@@ -323,17 +324,25 @@ debootstrap_extract_base (void) {
       snprintf(prtbuf, sizeof prtbuf, "file:%s", Archive_Dir);
       source = strdup(prtbuf);
   }
-  argv[0] = "/usr/sbin/debootstrap";
-  argv[1] = "--boot-floppies";
-  argv[2] = "--arch";
-  argv[3] = ARCHNAME;
-  argv[4] = "woody";
-  argv[5] = "/target";
-  argv[6] = source;
-  argv[7] = NULL;
+
+  argnum = 0;
+  argv[argnum++] = "/usr/sbin/debootstrap";
+  argv[argnum++] = "--boot-floppies";
+#ifdef USE_LANGUAGE_CHOOSER
+  /* Needed to generate locale data */
+  /* Hm, need to make sure these packages are available */
+  argv[argnum++] = "--include=locales";
+#endif /* USE_LANGUAGE_CHOOSER */
+  argv[argnum++] = "--arch";
+  argv[argnum++] = ARCHNAME;
+  argv[argnum++] = "woody";
+  argv[argnum++] = "/target";
+  argv[argnum++] = source;
+  argv[argnum++] = NULL;

-  INFOMSG("running '%s %s %s %s %s %s %s'",
-          argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
+  INFOMSG("running '%s %s %s %s %s %s %s %s'",
+          argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6],
+          argv[7] ? argv[7] : "(null)");

   rs = exec_debootstrap(argv);