mount: drop prefixes from the ostree image

Signed-off-by: Giuseppe Scrivano <[email protected]>

Closes: #1127
Approved by: ashcrow

Author: giuseppe

Atomic/mount.py

@@ -827,6 +827,8 @@ def mount(self, identifier, options=None): # pylint: disable=arguments-differ
         if not OSTREE_PRESENT:
             return False
 
+        identifier = util.remove_skopeo_prefixes(identifier)
+
         options = ['remount', 'ro', 'nosuid', 'nodev']
         has_container = self.has_container(identifier)
         has_image = self.has_image(identifier)

tests/integration/test_system_containers_mount.sh

@@ -65,7 +65,7 @@ OUTPUT=$(! ${ATOMIC} mount --live ${NAME} ${WORK_DIR}/mount 2>&1)
 grep "do not support --live" <<< $OUTPUT
 
 
-# 4. Check that --shared works
-${ATOMIC} mount --shared ${NAME} ${WORK_DIR}/mount
+# 4. Check that --shared works and that 'http:' is dropped
+${ATOMIC} mount --shared http:${NAME} ${WORK_DIR}/mount
 test -e ${WORK_DIR}/mount/usr/bin/greet.sh
 ${ATOMIC} umount ${WORK_DIR}/mount