@@ -75,23 +75,23 @@ if [ "$flag_image" = true ]; then
75
75
UUID_A=` sfdisk --part-uuid " $chromium_image " 3`
76
76
77
77
# Deletes third (ROOT_A) and fifth (ROOT_B) partitions
78
- sfdisk --delete $chromium_image 5
79
- sfdisk --delete $chromium_image 3
78
+ flock " $chromium_image " sfdisk --delete $chromium_image 5
79
+ flock " $chromium_image " sfdisk --delete $chromium_image 3
80
80
81
81
# Recreates the fifth partition with 4MB = 4194304
82
- echo -e ' n\n5\n' " $START_NEWB " ' \n' " $END_NEWB " ' \nw' | fdisk " $chromium_image " ; sync
83
- sfdisk --part-label " $chromium_image " 5 " ROOT-B"
84
- sfdisk --part-type " $chromium_image " 5 " 3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC"
85
- sfdisk --part-uuid " $chromium_image " 5 " $UUID_B "
86
- e2label " $PART_B " " ROOT-B"
82
+ echo -e ' n\n5\n' " $START_NEWB " ' \n' " $END_NEWB " ' \nw' | flock " $chromium_image " fdisk " $chromium_image " ;
83
+ flock " $chromium_image " sfdisk --part-label " $chromium_image " 5 " ROOT-B"
84
+ flock " $chromium_image " sfdisk --part-type " $chromium_image " 5 " 3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC"
85
+ flock " $chromium_image " sfdisk --part-uuid " $chromium_image " 5 " $UUID_B "
86
+ flock " $chromium_image " e2label " $PART_B " " ROOT-B"
87
87
mkfs.ext4 " $PART_B "
88
88
89
89
# Recreates the third partition with the remaining space
90
- echo -e ' n\n3\n' " $START_NEWA " ' \n' " $END_NEWA " ' \nw' | fdisk " $chromium_image " ; sync
91
- sfdisk --part-label " $chromium_image " 3 " ROOT-A"
92
- sfdisk --part-type " $chromium_image " 3 " 3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC"
93
- sfdisk --part-uuid " $chromium_image " 3 " $UUID_A "
94
- e2label " $PART_A " " ROOT-A"
90
+ echo -e ' n\n3\n' " $START_NEWA " ' \n' " $END_NEWA " ' \nw' | flock " $chromium_image " fdisk " $chromium_image " ;
91
+ flock " $chromium_image " sfdisk --part-label " $chromium_image " 3 " ROOT-A"
92
+ flock " $chromium_image " sfdisk --part-type " $chromium_image " 3 " 3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC"
93
+ flock " $chromium_image " sfdisk --part-uuid " $chromium_image " 3 " $UUID_A "
94
+ flock " $chromium_image " e2label " $PART_A " " ROOT-A"
95
95
mkfs.ext4 " $PART_A "
96
96
97
97
# Searches and fixes errors at filesystem-3, then remounts
@@ -149,7 +149,7 @@ if [ ! -z "$3" ]; then
149
149
fi
150
150
151
151
# Expose the internal camera to android container
152
- internal_camera=` dmesg | grep uvcvideo -m 1 | awk -F'[ ()]' ' {print $2 }' `
152
+ internal_camera=` dmesg | grep uvcvideo -m 1 | awk -F ' [()]' ' {print $2}' `
153
153
original_camera=` sed -nr ' s,^camera0.module0.usb_vid_pid=(.*),\1,p' /home/chronos/local/etc/camera/camera_characteristics.conf`
154
154
if [ ! -z $internal_camera ] && [ ! -z $original_camera ]
155
155
then
0 commit comments