[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#82482: potential fix



Howdy,

The following patch reads the symlink setup by the install.sh of
the rescue disk when manipulating the kernel symbolic link.  This
should capture the subarch correctly.

Matt

Index: utilities/dbootstrap/bootconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/bootconfig.c,v
retrieving revision 1.85
diff -u -r1.85 bootconfig.c
--- utilities/dbootstrap/bootconfig.c	2001/03/23 01:51:32	1.85
+++ utilities/dbootstrap/bootconfig.c	2001/04/08 17:38:30
@@ -514,9 +514,15 @@
   fprintf(filep,"timeout=100\n");
   /* This is where it get's tricky */
   if (Boot != Root) {
+      char buffer[256], *p;
+      readlink("/target/boot/vmlinuz", buf, sizeof(buf));
+      buf[256] = '\0';
+      p = strrchr(buffer, '/');
+      if (p == NULL)
+        p = buf;
       unlink("/target/vmlinuz"); /* does us no good */
       unlink("/target/boot/vmlinuz"); /* make sure this is gone */
-      symlink("vmlinuz-" KVER, "/target/boot/vmlinuz");
+      symlink(p, "/target/boot/vmlinuz");
   }
   fprintf(filep,"image=%s/vmlinuz\n", boot_part); /* just to make sure the partition is right */
   fprintf(filep,"label=linux\nread-only\n");

Attachment: pgp05aGVAfgkv.pgp
Description: PGP signature


Reply to: