diff options
| author | Michal Suchanek <hramrach@centrum.cz> | 2010-07-27 12:05:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:53:27 +0100 |
| commit | 40838c0eb824945d308dc4cf3d70a4a6014542f5 (patch) | |
| tree | 82995c4b04b2beedb53e3b19e9348250f5708303 /scripts | |
| parent | 3c1e19826107ed0e375f69c6c92e5cbf897d3488 (diff) | |
| download | live-boot-40838c0eb824945d308dc4cf3d70a4a6014542f5.tar.gz live-boot-40838c0eb824945d308dc4cf3d70a4a6014542f5.zip | |
Fix omitpids to work with readonly images.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 10 |
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 |