emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle fstab with spaces

Browse Source
This commit is contained in:
Roy Marples 2007-09-26 07:30:00 +00:00
parent 8a7b58a73d
commit e24d808fc5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sh.Linux/init.sh
View File

@ -68,7 +68,7 @@ mount_svcdir() {
cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \ cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \
"${RC_SVCDIR}"/nettree "${RC_LIBDIR}"/tmp 2>/dev/null "${RC_SVCDIR}"/nettree "${RC_LIBDIR}"/tmp 2>/dev/null
fi fi
try mount -n ${mntcmd} eval try mount -n ${mntcmd}
if ${dotmp} ; then if ${dotmp} ; then
cp -p "${RC_LIBDIR}"/tmp/deptree "${RC_LIBDIR}"/tmp/depconfig \ cp -p "${RC_LIBDIR}"/tmp/deptree "${RC_LIBDIR}"/tmp/depconfig \
"${RC_LIBDIR}"/tmp/nettree "${RC_SVCDIR}" 2>/dev/null "${RC_LIBDIR}"/tmp/nettree "${RC_SVCDIR}" 2>/dev/null
@ -122,7 +122,7 @@ if ${mountproc} ; then
[ "${RC_UNAME}" = "GNU/kFreeBSD" ] && proc="linprocfs" [ "${RC_UNAME}" = "GNU/kFreeBSD" ] && proc="linprocfs"
ebegin "Mounting ${procfs} at /proc" ebegin "Mounting ${procfs} at /proc"
mntcmd="$(fstabinfo --mountcmd /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 $? eend $?
fi fi
unset mountproc unset mountproc
@ -143,7 +143,7 @@ if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${RC_SYS}" != "VPS" -a "${K26}" = "0" ]
if ! mountinfo --quiet /sys ; then if ! mountinfo --quiet /sys ; then
ebegin "Mounting sysfs at /sys" ebegin "Mounting sysfs at /sys"
mntcmd="$(fstabinfo --mountcmd /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 $? eend $?
fi fi
else else
@ -212,7 +212,7 @@ if grep -Eq "[[:space:]]+devpts$" /proc/filesystems && \
if [ -d /dev/pts ] ; then if [ -d /dev/pts ] ; then
ebegin "Mounting devpts at /dev/pts" ebegin "Mounting devpts at /dev/pts"
mntcmd="$(fstabinfo --mountcmd /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 $? eend $?
fi fi
fi fi

4
src/fstabinfo.c
View File

@ -186,8 +186,8 @@ int fstabinfo (int argc, char **argv)
switch (output) { switch (output) {
case OUTPUT_MOUNTCMD: case OUTPUT_MOUNTCMD:
printf ("-o %s -t %s %s %s\n", ENT_OPTS (ent), ENT_TYPE (ent), printf ("-o %s -t %s '%s' '%s'\n", ENT_OPTS (ent),
ENT_DEVICE (ent), ENT_FILE (ent)); ENT_TYPE (ent), ENT_DEVICE (ent), ENT_FILE (ent));
break; break;
case OUTPUT_OPTIONS: case OUTPUT_OPTIONS:

2
src/rc-update.c
View File

@ -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) || if ((action & DOSHOW && action != DOSHOW) ||
(action & DOADD && action != DOADD) || (action & DOADD && action != DOADD) ||

2
src/start-stop-daemon.c
View File

@ -685,7 +685,7 @@ int start_stop_daemon (int argc, char **argv)
} }
quiet = rc_env_bool ("RC_QUIET"); 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 /* Allow start-stop-daemon --signal HUP --exec /usr/sbin/dnsmasq
* instead of forcing --stop --oknodo as well */ * instead of forcing --stop --oknodo as well */