!183 check user mounts

Merge pull request !183 from haozi007/newwork

CI/test_cases/basic_cases/run.bash

@@ -30,7 +30,18 @@ function do_test_t()
     fn_check_eq "$?" "0" "run failed"
     testcontainer $containername running
 
-    isula stop $containername
+    isula stop -t 0 $containername
+    fn_check_eq "$?" "0" "stop failed"
+    testcontainer $containername exited
+
+    isula rm $containername
+    fn_check_eq "$?" "0" "rm failed"
+
+    isula run --name $containername -td -v /dev/shm:/dev/shm busybox
+    fn_check_eq "$?" "0" "run failed"
+    testcontainer $containername running
+
+    isula stop -t 0 $containername
     fn_check_eq "$?" "0" "stop failed"
     testcontainer $containername exited
 

src/services/execution/spec/specs_mount.c

@@ -2363,7 +2363,7 @@ int merge_conf_mounts(oci_runtime_spec *oci_spec, host_config *host_spec,
         add_shm_mount(oci_spec, v2_spec->shm_path);
     }
 
-    if (host_spec->shm_size > 0) {
+    if (!has_mount_shm(host_spec, v2_spec) && host_spec->shm_size > 0) {
         ret = change_dev_shm_size(oci_spec, host_spec);
         if (ret) {
             ERROR("Failed to set dev shm size");