Add "diskimage put" support for source file from stdin

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/config.d/05diskimage_guestfish.defconf b/config.d/05diskimage_guestfish.defconf
index cd40b033137ee0c111060be124916ed3c864ddb1..7944430186ce8dd2e36ae01d2cff90fe1e770821 100644 (file)
--- a/config.d/05diskimage_guestfish.defconf
+++ b/config.d/05diskimage_guestfish.defconf
@@ -149,7 +149,14 @@ diskimage_grep_guestfish ()
 
 diskimage_put_guestfish ()
 {
-    guestfish --remote upload "$1" "$2"
+    if [ "$1" = "-" ] ; then
+       local t=$(mktemp)
+       cat > "$t"
+       guestfish --remote upload "$t" "$2"
+       rm "$t"
+    else
+       guestfish --remote upload "$1" "$2"
+    fi
 }
 
 diskimage_ln_s_guestfish ()

diff --git a/config.d/05diskimage_guestmount.defconf b/config.d/05diskimage_guestmount.defconf
index 3074cafa2c436ab8c884ef563d948b9efaa2f7ca..4c1757514a388e32c3ade680a01ae5d1dc7ed7aa 100644 (file)
--- a/config.d/05diskimage_guestmount.defconf
+++ b/config.d/05diskimage_guestmount.defconf
@@ -109,7 +109,11 @@ diskimage_grep_guestmount ()
 
 diskimage_put_guestmount ()
 {
-    cp "$1" "mnt$2"
+    if [ "$1" = "-" ] ; then
+       cat >"mnt$2"
+    else
+       cp "$1" "mnt$2"
+    fi
 }
 
 diskimage_ln_s_guestmount ()

diff --git a/config.d/05diskimage_loopback.defconf b/config.d/05diskimage_loopback.defconf
index 5d2c13c38525e7939dba61f40213e3d1d3ef8b4f..2a261a070f58d1f2a0d972255f417723ead12991 100644 (file)
--- a/config.d/05diskimage_loopback.defconf
+++ b/config.d/05diskimage_loopback.defconf
@@ -131,7 +131,11 @@ diskimage_grep_loopback ()
 
 diskimage_put_loopback ()
 {
-    cp "$1" "mnt$2"
+    if [ "$1" = "-" ] ; then
+       cat >"mnt$2"
+    else
+       cp "$1" "mnt$2"
+    fi
 }
 
 diskimage_ln_s_loopback ()