diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-08-18 22:08:29 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-08-18 22:08:29 +0100 |
| commit | d67e6ea75dde6309ce4c6162a4a0429ab8d6709b (patch) | |
| tree | e944fdbf86577e37759686d952bdbb337ff99e6d /sparsify | |
| parent | 781d72f55897b1ed923c795a0132241f53f6c6eb (diff) | |
| download | libguestfs-d67e6ea75dde6309ce4c6162a4a0429ab8d6709b.tar.gz libguestfs-d67e6ea75dde6309ce4c6162a4a0429ab8d6709b.tar.xz libguestfs-d67e6ea75dde6309ce4c6162a4a0429ab8d6709b.zip | |
Replace mount-options with mount where appropriate.
Since our minimum supported version is now 1.16 and mount was fixed in
1.13.16, it is now safe to replace mount-options + empty options with
mount wherever it occurs.
Diffstat (limited to 'sparsify')
| -rw-r--r-- | sparsify/sparsify.ml | 2 | ||||
| -rwxr-xr-x | sparsify/test-virt-sparsify.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml index 8e431895..379ccf48 100644 --- a/sparsify/sparsify.ml +++ b/sparsify/sparsify.ml @@ -270,7 +270,7 @@ let () = g#zero_device fs ) else ( let mounted = - try g#mount_options "" fs "/"; true + try g#mount fs "/"; true with _ -> false in if mounted then ( diff --git a/sparsify/test-virt-sparsify.sh b/sparsify/test-virt-sparsify.sh index 4a7a2f65..02e98a5d 100755 --- a/sparsify/test-virt-sparsify.sh +++ b/sparsify/test-virt-sparsify.sh @@ -26,9 +26,9 @@ rm -f test1.img test2.img ../fish/guestfish \ -N bootrootlv:/dev/VG/LV:ext2:ext4:400M:32M:gpt <<EOF -mount-options "" /dev/VG/LV / +mount /dev/VG/LV / mkdir /boot -mount-options "" /dev/sda1 /boot +mount /dev/sda1 /boot fill 1 300M /big fill 1 10M /boot/big sync |