uvol: yet another small compatibility hack

Shift ARGV until actual parameters start to compensate for older
versions of ucode passing the complete cmdline.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/utils/uvol/files/uvol b/utils/uvol/files/uvol
index 6a5a82c138cf9b1cb76e6735161924cc9025e415..a4f023ffd78133c85a81d09a452f33c05fceb348 100644 (file)
--- a/utils/uvol/files/uvol
+++ b/utils/uvol/files/uvol
@@ -64,7 +64,18 @@ if (!backend) {
        exit(2);
 }
 
-let cmd = shift(ARGV);
+// The below code is needed as older versions of ucode pass the complete cmdline via ARGV
+// Once we can rely in more recent ucode the while loop can be replaced by simply
+// let cmd = shift(ARGV);
+let skip = null;
+let cmd = null;
+let skip_argv = ["/usr/bin/ucode", "-R", "/usr/sbin/uvol"];
+while (skip = shift(ARGV)) {
+       if (skip != shift(skip_argv)) {
+               cmd = skip;
+               break;
+       }
+}
 
 if (!cmd || cmd == "-h" || cmd == "help") {
        printf("%s", help_output);