remove hardcoding of system.conf path in various service calls

diff --git a/commands/readclock/readclock.sh b/commands/readclock/readclock.sh
index 97c94c3ef8b21406f60e56a56efdfa4467205616..ff23803bd0f9a1f7a3801cf1b8ecc85dd23d1b42 100644 (file)
--- a/commands/readclock/readclock.sh
+++ b/commands/readclock/readclock.sh
@@ -2,4 +2,4 @@
 if [ $# -gt 0 ]
 then   ARGS="-args $@"
 fi
-/bin/service up /sbin/readclock.drv -config /etc/system.conf -period 5HZ -script /etc/rs.single $ARGS
+/bin/service up /sbin/readclock.drv -period 5HZ -script /etc/rs.single $ARGS

diff --git a/commands/swifi/run_swifi b/commands/swifi/run_swifi
index 8174831c8fb680ab05c7d646605ca2aa236d4d68..0d5ae99e3ec38bb0e209c4d01baafdcab8cc743d 100644 (file)
--- a/commands/swifi/run_swifi
+++ b/commands/swifi/run_swifi
@@ -46,7 +46,7 @@ one_round()
 # Start our own driver.
 service down $LABEL
 sleep 10       # Allow driver to die
-service up $EXE -script `pwd`/rs.restart_imm -config /etc/system.conf -period 3HZ
+service up $EXE -script `pwd`/rs.restart_imm -period 3HZ
 
 i=0
 i=4000

diff --git a/commands/swifi/run_t1 b/commands/swifi/run_t1
index 33f6b12d4572b6fb589b09ce6d4a5d70c3155018..cae9cb4ef9cb681feb207ea4e0006a261198d350 100755 (executable)
--- a/commands/swifi/run_t1
+++ b/commands/swifi/run_t1
@@ -103,7 +103,7 @@ esac
 # Start our own driver.
 service down $LABEL
 sleep 2        # Allow driver to die
-service up $EXE -script `pwd`/rs.restart_imm -config /etc/system.conf -period 3HZ $DEV
+service up $EXE -script `pwd`/rs.restart_imm -period 3HZ $DEV
 
 i=0
 while [ $i -lt "$count" ]

diff --git a/commands/swifi/run_t2 b/commands/swifi/run_t2
index d37bbf61a99214e5fb37ded0b4bfde300378c10f..4bce2aeaaa768ed9e2eec601c026d26bba510324 100755 (executable)
--- a/commands/swifi/run_t2
+++ b/commands/swifi/run_t2
@@ -123,7 +123,7 @@ esac
 # Start our own driver.
 service down $LABEL
 sleep 10       # Allow driver to die
-service up $EXE -script `pwd`/rs.restart_imm -config /etc/system.conf -period 3HZ
+service up $EXE -script `pwd`/rs.restart_imm -period 3HZ
 
 i=0
 while [ $i -lt "$count" ]

diff --git a/lib/libc/other/_mount.c b/lib/libc/other/_mount.c
index 952963a5099c3c3a63d45fd009f34bbed060888b..8c473ce8b1fc1489a5b5c4137405a641f7f39ef5 100644 (file)
--- a/lib/libc/other/_mount.c
+++ b/lib/libc/other/_mount.c
@@ -91,13 +91,12 @@ int mountflags;
   }
 
   if(strlen(_PATH_SERVICE)+strlen(path)+strlen(label)+
-     strlen(_PATH_SYSTEM_CONF)+strlen(args)+50 >= sizeof(cmd)) {
+     strlen(args)+50 >= sizeof(cmd)) {
        errno = E2BIG;
        return -1;
   }
 
-  sprintf(cmd, _PATH_SERVICE " %sup %s -label '%s' -config " _PATH_SYSTEM_CONF
-       " -args '%s%s'",
+  sprintf(cmd, _PATH_SERVICE " %sup %s -label '%s' -args '%s%s'",
          reuse ? "-r ": "", path, label, args[0] ? "-o " : "", args);
 
   if((r = system(cmd)) != 0) {