aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsh.Linux/init.sh8
-rw-r--r--src/fstabinfo.c4
-rw-r--r--src/rc-update.c2
-rw-r--r--src/start-stop-daemon.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index ab93f23c..b0c2215f 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -68,7 +68,7 @@ mount_svcdir() {
cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \
"${RC_SVCDIR}"/nettree "${RC_LIBDIR}"/tmp 2>/dev/null
fi
- try mount -n ${mntcmd}
+ eval try mount -n ${mntcmd}
if ${dotmp} ; then
cp -p "${RC_LIBDIR}"/tmp/deptree "${RC_LIBDIR}"/tmp/depconfig \
"${RC_LIBDIR}"/tmp/nettree "${RC_SVCDIR}" 2>/dev/null
@@ -122,7 +122,7 @@ if ${mountproc} ; then
[ "${RC_UNAME}" = "GNU/kFreeBSD" ] && proc="linprocfs"
ebegin "Mounting ${procfs} at /proc"
mntcmd="$(fstabinfo --mountcmd /proc)"
- try mount -n ${mntcmd:--t ${procfs} -o noexec,nosuid,nodev proc /proc}
+ eval try mount -n ${mntcmd:--t ${procfs} -o noexec,nosuid,nodev proc /proc}
eend $?
fi
unset mountproc
@@ -143,7 +143,7 @@ if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${RC_SYS}" != "VPS" -a "${K26}" = "0" ]
if ! mountinfo --quiet /sys ; then
ebegin "Mounting sysfs at /sys"
mntcmd="$(fstabinfo --mountcmd /sys)"
- try mount -n ${mntcmd:--t sysfs -o noexec,nosuid,nodev sysfs /sys}
+ eval try mount -n ${mntcmd:--t sysfs -o noexec,nosuid,nodev sysfs /sys}
eend $?
fi
else
@@ -212,7 +212,7 @@ if grep -Eq "[[:space:]]+devpts$" /proc/filesystems && \
if [ -d /dev/pts ] ; then
ebegin "Mounting devpts at /dev/pts"
mntcmd="$(fstabinfo --mountcmd /dev/pts)"
- try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts}
+ eval try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts}
eend $?
fi
fi
diff --git a/src/fstabinfo.c b/src/fstabinfo.c
index 85640ccf..db8d9623 100644
--- a/src/fstabinfo.c
+++ b/src/fstabinfo.c
@@ -186,8 +186,8 @@ int fstabinfo (int argc, char **argv)
switch (output) {
case OUTPUT_MOUNTCMD:
- printf ("-o %s -t %s %s %s\n", ENT_OPTS (ent), ENT_TYPE (ent),
- ENT_DEVICE (ent), ENT_FILE (ent));
+ printf ("-o %s -t %s '%s' '%s'\n", ENT_OPTS (ent),
+ ENT_TYPE (ent), ENT_DEVICE (ent), ENT_FILE (ent));
break;
case OUTPUT_OPTIONS:
diff --git a/src/rc-update.c b/src/rc-update.c
index b6c992f6..e799f973 100644
--- a/src/rc-update.c
+++ b/src/rc-update.c
@@ -161,7 +161,7 @@ int rc_update (int argc, char **argv)
}
}
- verbose = rc_is_env ("RC_VERBOSE", "yes");
+ verbose = rc_env_bool ("RC_VERBOSE");
if ((action & DOSHOW && action != DOSHOW) ||
(action & DOADD && action != DOADD) ||
diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c
index f61c2d90..89d03a2f 100644
--- a/src/start-stop-daemon.c
+++ b/src/start-stop-daemon.c
@@ -685,7 +685,7 @@ int start_stop_daemon (int argc, char **argv)
}
quiet = rc_env_bool ("RC_QUIET");
- verbose = rc_is_env ("RC_VERBOSE", "yes");
+ verbose = rc_env_bool ("RC_VERBOSE");
/* Allow start-stop-daemon --signal HUP --exec /usr/sbin/dnsmasq
* instead of forcing --stop --oknodo as well */