Skip to content

Commit 6e82acb

Browse files
committed
Claude review udates: Make updates based on on asking claude to find
bugs.
1 parent 68081e3 commit 6e82acb

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

lvm_create

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ devices_to_use=""
2424
devices_list=""
2525
lvm_vol=""
2626
lvm_grp=""
27-
wipefs=""
27+
wipefs=0
28+
29+
error_out()
30+
{
31+
echo $1
32+
exit $2
33+
}
2834

2935
usage()
3036
{
@@ -42,22 +48,18 @@ usage()
4248
validate_data()
4349
{
4450
if [[ $lvm_vol = "" ]]; then
45-
echo Need to designate an lvm_vol name.
46-
exit -1
51+
error_out "Need to designate an lvm_vol name." 1
4752
fi
4853
if [[ $lvm_grp = "" ]]; then
49-
echo Need to designate an lvm_grp name.
50-
exit -1
54+
error_out "Need to designate an lvm_grp name." 1
5155
fi
5256
if [[ $devices_to_use = "" ]]; then
53-
echo Need to designate an lvm_grp name.
54-
exit -1
57+
error_out "Need to designate at least one device to use." 1
5558
fi
5659
for i in $devices_to_use;
5760
do
5861
if [[ ! -e $i ]]; then
59-
echo Error, device $i not found.
60-
exit -1
62+
error_out "Error, device $i not found." 1
6163
fi
6264
done
6365
}
@@ -86,9 +88,9 @@ opts=$(getopt \
8688
)
8789

8890
if [ $? -ne 0 ]; then
89-
exit
91+
exit 0
9092
fi
91-
eval set --$opts
93+
eval set -- "$opts"
9294

9395
while [[ $# -gt 0 ]]; do
9496
case "$1" in
@@ -130,7 +132,7 @@ validate_data
130132
seper=""
131133
for i in $devices_to_use; do
132134
lv_disks=${i}${seper}${lv_disks}
133-
size=`fdisk -l $i | grep bytes | grep Disk | cut -d' ' -f 5`
135+
size=`lsblk -b -d -n -o SIZE $i`
134136
gb=`echo "$size/(1024*1024*1024)" | bc`
135137
let "lv_total_size=$lv_total_size+$gb"
136138
let "lv_disk_count=$lv_disk_count+1"
@@ -145,20 +147,17 @@ vgremove -f $lvm_vol
145147
let "total_size=$lv_total_size-200"
146148
pvcreate -ff $lv_disks
147149
if [ $? -ne 0 ]; then
148-
echo pvcreate -ff $lv_disks failed.
149-
exit -1
150+
error_out "pvcreate -ff $lv_disks failed." 1
150151
fi
151152
sleep 60
152153
vgcreate $lvm_vol $lv_disks
153154
if [ $? -ne 0 ]; then
154-
echo vgcreate $lvm_vol $lv_disks failed
155-
exit -1
155+
error_out "vgcreate $lvm_vol $lv_disks failed" 1
156156
fi
157157
sleep 60
158-
echo y | lvcreate -Zy -Wy --yes -i $lv_disk_count -L ${total_size}G -n $lvm_vol $lvm_grp
158+
lvcreate -Zy -Wy --yes -i $lv_disk_count -L ${total_size}G -n $lvm_vol $lvm_grp
159159
if [ $? -ne 0 ]; then
160-
echo lvcreate -Zy -Wy --yes -i $lv_disk_count -L ${total_size}G -n $lvm_vol $lvm_grp failed.
161-
exit -1
160+
error_out "lvcreate -Zy -Wy --yes -i $lv_disk_count -L ${total_size}G -n $lvm_vol $lvm_grp failed." 1
162161
fi
163162
wipefs -f /dev/$lvm_vol/$lvm_grp
164-
163+
exit 0

0 commit comments

Comments
 (0)