Changeset 17204

Timestamp:

06/16/11 15:13:34 (2 years ago)

Author:

BrainSlayer

Message:

new x86 code

File:

• src/router/services/sysinit/sysinit-x86.c (modified) (4 diffs)

src/router/services/sysinit/sysinit-x86.c

@@ -57 +57 @@
 #define sys_reboot() eval("sync"); eval("event","3","1","15")
 
-static int getdiscindex(void)   // works only for squashfs 
+static char *getdisc(void)      // works only for squashfs 
 {
         int i;
-
-        for (i = 0; i < 10; i++) {
+        unsigned char *disks[]={"/dev/sda2","/dev/sdb2","/dev/sdc2","/dev/sdd2","/dev/sde2","/dev/sdf2","/dev/sdg2","/dev/sdh2","/dev/sdi2"};
+        for (i = 0; i < 9; i++) {
                 char dev[64];
 
-                sprintf(dev, "/dev/discs/disc%d/part2", i);
+                strcpy(dev, disks[i]);
                 FILE *in = fopen(dev, "rb");
 
@@ -77 +77 @@
                         fclose(in);
                         // filesystem detected
-                        return i;
+                        return disks[i];
                 }
                 fclose(in);
         }
-        return -1;
+        return NULL;
 }
 
@@ -89 +89 @@
 
         char dev[64];
-        int index = getdiscindex();
-
-        if (index == -1) {
+        char *disk = getdisc();
+
+        if (disk == NULL) {
                 fprintf(stderr,
                         "no valid dd-wrt partition found, calling shell");
@@ -114 +114 @@
         if (in == NULL) {
                 fprintf(stderr, "recover broken nvram\n");
-                sprintf(dev, "/dev/discs/disc%d/disc", index);
+                strcpy(dev,disk);
                 in = fopen(dev, "rb");
                 fseeko(in, 0, SEEK_END);