diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-10-04 09:33:47 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-10-04 09:33:47 +0000 |
| commit | 7d6094ed068f16d6fd5a51aa201865efbc364669 (patch) | |
| tree | 27de163b15791005c073453f1d8404faa9ad711e /tests.as-root | |
| parent | 83852b33aba7e11879ef167a813c9a6f32784841 (diff) | |
| download | morph-7d6094ed068f16d6fd5a51aa201865efbc364669.tar.gz | |
Pass -d to umount to clean up loops.
This alters the test behaviour so that umount;losetup becomes
umount -d. This means that util-linux and busybox line up in
terms of behaviour for this test.
Reviewed-By: Richard Maw (Over the shoulder)
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/make-patch.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index de1ce172..7a855f99 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -94,7 +94,7 @@ loop=$(losetup -o "$(expr "$offset" '*' "$ssz")" -f --show "$img1") udevadm settle trap 'losetup -d "$loop"' INT TERM EXIT mount -o subvol=factory-run -t btrfs "$loop" "$DATADIR/unpacked" -trap 'umount "$DATADIR/unpacked"; losetup -d "$loop"' INT TERM EXIT +trap 'umount -d "$DATADIR/unpacked"' INT TERM EXIT cd "$DATADIR/unpacked" echo "old version:" |