summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/live b/scripts/live
index 295b75f..a17eb42 100755
--- a/scripts/live
+++ b/scripts/live
@@ -801,7 +801,7 @@ do_httpmount ()
fi
modprobe fuse
$FUSE_MOUNT "${url}" "${dest}"
- FUSE_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
+ ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
fi
[ ${?} -eq 0 ] && rc=0
[ "${extension}" = "tgz" ] && live_dest="ram"
@@ -832,9 +832,6 @@ do_httpmount ()
elif [ "${webfile}" != "FETCH" ] ; then
NETBOOT="${webfile}"
export NETBOOT
- if [ -n "${FUSE_PID}" ] ; then
- echo "${FUSE_PID}" > ${mountpoint}/root.pid
- fi
fi
return ${rc}
@@ -1795,6 +1792,11 @@ mountroot ()
mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
fi
+
+ if [ -n "${ROOT_PID}" ] ; then
+ echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid
+ fi
+
log_end_msg
# unionfs-fuse needs /dev to be bind-mounted for the duration of