X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fguestfish.pod;h=7ceb07104c829e93089ebc9e02da9b3e1dd9c2f5;hb=11ebf214987a2e97de31313b49d0320cceb78275;hp=696d3b3f30f92876da94b32bed9792ee4746d031;hpb=3a546663655abfcd6399d4fdb7febc6b0d83b822;p=libguestfs.git diff --git a/fish/guestfish.pod b/fish/guestfish.pod index 696d3b3..7ceb071 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -203,7 +203,7 @@ Domain UUIDs can be used instead of names. Using this flag is mostly equivalent to using the C command, with C if the I<--ro> flag was given, and -with C if the I<--format:...> flag was given. +with C if the I<--format=...> flag was given. =item B<-D> @@ -996,14 +996,15 @@ and cleans up guestfish when the script exits: exit 1 fi - kill_guestfish () + cleanup_guestfish () { - kill $GUESTFISH_PID >/dev/null 2>&1 ||: + guestfish --remote -- exit >/dev/null 2>&1 ||: } - trap kill_guestfish EXIT + trap cleanup_guestfish EXIT ERR - guestfish --remote run - # etc. + guestfish --remote -- run + + # ... =head2 REMOTE CONTROL RUN COMMAND HANGING @@ -1283,6 +1284,7 @@ L, L, L, L, +L, L, L, L, @@ -1312,4 +1314,4 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.