decode-panic deal with kextload

kextload won't handle -arch. deal appropriately.

Change-Id: Iac7dac9b484e44b9610da028027aadbd94cfe151
Reviewed-on: http://gerrit.openafs.org/1246
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/packaging/MacOS/decode-panic b/src/packaging/MacOS/decode-panic
index cd7c874f99276a7119249efd8283e3504ac7e0ad..42fc1bd2e80332e26c2dd7902cf852419e0247e3 100755 (executable)
--- a/src/packaging/MacOS/decode-panic
+++ b/src/packaging/MacOS/decode-panic
@@ -305,30 +305,53 @@ sub generate_symbol_files {
     my $kernel = shift;
     my $kext = shift;
 
-    if ($kernel eq "/mach_kernel") {
-       if ($option_verbose) {
-           print "$kextprog -k $kernel -s $temp_dir -arch $kextarch -a org.openafs.filesystems.afs\@${kernel_address} -n $kext\n";
+    if ($kextprog eq $kextload) {
+       if ($kernel eq "/mach_kernel") {
+           if ($option_verbose) {
+               print "$kextprog -k $kernel -s $temp_dir -a org.openafs.filesystems.afs\@${kernel_address} -n $kext\n";
+           }
+           system( $kextprog,
+                   "-k", $kernel,
+                   "-s", $temp_dir,
+                   "-a", 'org.openafs.filesystems.afs@' . $kernel_address,
+                   "-n", $kext );
+       } else {
+           if ($option_verbose) {
+               print "$kextprog -c -e -r $temp_dir -k $kernel -s $temp_dir -a org.openafs.filesystems.afs\@${kernel_address} -n $kext\n";
+           }
+           system( $kextprog,
+                   "-c", "-e",
+                   "-r", $temp_dir,
+                   "-k", $kernel,
+                   "-s", $temp_dir,
+                   "-a", 'org.openafs.filesystems.afs@' . $kernel_address,
+                   "-n", $kext );
        }
-       system( $kextprog,
-               "-k", $kernel,
-               "-s", $temp_dir,
-               "-arch", $kextarch,
-               "-a", 'org.openafs.filesystems.afs@' . $kernel_address,
-               "-n", $kext );
     } else {
-       if ($option_verbose) {
-           print "$kextprog -c -e -r $temp_dir -k $kernel -s $temp_dir -arch $kextarch -a org.openafs.filesystems.afs\@${kernel_address} -n $kext\n";
+       if ($kernel eq "/mach_kernel") {
+           if ($option_verbose) {
+               print "$kextprog -k $kernel -s $temp_dir -arch $kextarch -a org.openafs.filesystems.afs\@${kernel_address} -n $kext\n";
+           }
+           system( $kextprog,
+                   "-k", $kernel,
+                   "-s", $temp_dir,
+                   "-arch", $kextarch,
+                   "-a", 'org.openafs.filesystems.afs@' . $kernel_address,
+                   "-n", $kext );
+       } else {
+           if ($option_verbose) {
+               print "$kextprog -c -e -r $temp_dir -k $kernel -s $temp_dir -arch $kextarch -a org.openafs.filesystems.afs\@${kernel_address} -n $kext\n";
+           }
+           system( $kextprog,
+                   "-c", "-e",
+                   "-r", $temp_dir,
+                   "-k", $kernel,
+                   "-s", $temp_dir,
+                   "-arch", $kextarch,
+                   "-a", 'org.openafs.filesystems.afs@' . $kernel_address,
+                   "-n", $kext );
        }
-       system( $kextprog,
-               "-c", "-e",
-               "-r", $temp_dir,
-               "-k", $kernel,
-               "-s", $temp_dir,
-               "-arch", $kextarch,
-               "-a", 'org.openafs.filesystems.afs@' . $kernel_address,
-               "-n", $kext );
-    }
-    
+    }    
     if ( $CHILD_ERROR ) {
         # error
         croak "kextload failed to run: $OS_ERROR\n";