X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=a17eb423fca132f0aaf03c8ca6f956766eaef797;hb=1c4dc9f658699ba622c33f8333c4d0d6da02c075;hp=295b75faaedf255c4b30d31193bebc077826f8d3;hpb=10bbb53ef3cffbb458d7f593fdd55a9240bd359a;p=live-boot-grml.git 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