Changeset 1719 for branches/6.2/packages/initramfs/init.c

Timestamp:

09/07/06 23:48:17 (2 years ago)

Author:

alexander

Message:

Previously, due to a programming error (reuse of the loop variable
for other purpose inside the loop) the CD wouldn't find itself when booting
from /dev/hdd if /dev/hdb contained a wrong CD. This bug is now fixed.

Files:

• branches/6.2/packages/initramfs/init.c (modified) (3 diffs)

branches/6.2/packages/initramfs/init.c

@@ -17 +17 @@
         "/dev/hda", "/dev/hdb", "/dev/hdc", "/dev/hdd", "/dev/hde", "/dev/hdf", "/dev/hdg", "/dev/hdh",
         "/dev/sr0", "/dev/sr1", "/dev/sr2", "/dev/sr3", "/dev/sr4", "/dev/sr5", "/dev/sr6", "/dev/sr7",
-        NULL,
+        NULL
 };
 
@@ -182 +182 @@
         struct iso_primary_descriptor pd;
         int i;
+        int correct_cd;
 
         for(i=0;devices[i]!=NULL;i++)
@@ -237 +238 @@
                    generated by the livecd Makefiles */
 
-                i = strncmp(VOLUME_ID, pd.volume_id, strlen(VOLUME_ID));
-                if (i!=0) {
+                correct_cd = strncmp(VOLUME_ID, pd.volume_id, strlen(VOLUME_ID));
+                if (correct_cd!=0) {
                         printf("This is not the correct CD. Moving on...\n");
                         close(fd);