shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

fsadm: some cleanup

Browse Source 
Put some extra "" around vars.
Indent.
Error messages with dots.
This commit is contained in:
Zdenek Kabelac 2017-05-10 15:13:35 +02:00
parent 1107d483a2
commit 8ea33b633a
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scripts/fsadm.sh
View File

@ -187,18 +187,16 @@ detect_fs() {
test -n "$VOLUME" || error "Cannot get readlink \"$1\"."
RVOLUME=$VOLUME
case "$RVOLUME" in
# hardcoded /dev since udev does not create these entries elsewhere
# hardcoded /dev since udev does not create these entries elsewhere
/dev/dm-[0-9]*)
read </sys/block/${RVOLUME#/dev/}/dm/name SYSVOLUME 2>&1 && VOLUME="$DM_DEV_DIR/mapper/$SYSVOLUME"
read </sys/block/${RVOLUME#/dev/}/dev MAJORMINOR 2>&1 || error "Cannot get major:minor for \"$VOLUME\""
read </sys/block/${RVOLUME#/dev/}/dev MAJORMINOR 2>&1 || error "Cannot get major:minor for \"$VOLUME\"."
;;
*)
STAT=$(stat --format "MAJOR=%t MINOR=%T" ${RVOLUME})
STAT=$(stat --format "MAJOR=\$((0x%t)) MINOR=\$((0x%T))" ${RVOLUME})
test -n "$STAT" || error "Cannot get major:minor for \"$VOLUME\"."
eval $STAT
MAJOR=$((0x${MAJOR}))
MINOR=$((0x${MINOR}))
MAJORMINOR=${MAJOR}:${MINOR}
eval "$STAT"
MAJORMINOR="${MAJOR}:${MINOR}"
;;
esac
# use null device as cache file to be sure about the result
@ -207,10 +205,10 @@ detect_fs() {
test -n "$FSTYPE" || error "Cannot get FSTYPE of \"$VOLUME\"."
FSTYPE=${FSTYPE##*TYPE=\"} # cut quotation marks
FSTYPE=${FSTYPE%%\"*}
verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\""
verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"."
}
detect_mounted_with_proc_self_mountinfo() {
detect_mounted_with_proc_self_mountinfo() {
MOUNTED=$("$GREP" "^[0-9]* [0-9]* $MAJORMINOR " "$PROCSELFMOUNTINFO")
# extract 5th field which is mount point
@ -221,7 +219,7 @@ detect_mounted_with_proc_self_mountinfo() {
test -n "$MOUNTED"
}
detect_mounted_with_proc_mounts() {
detect_mounted_with_proc_mounts() {
MOUNTED=$("$GREP" "^$VOLUME[ \t]" "$PROCMOUNTS")
# for empty string try again with real volume name
@ -245,13 +243,13 @@ detect_mounted_with_proc_mounts() {
# check if the given device is already mounted and where
# FIXME: resolve swap usage and device stacking
detect_mounted() {
detect_mounted() {
if test -e "$PROCSELFMOUNTINFO"; then
detect_mounted_with_proc_self_mountinfo
elif test -e "$PROCMOUNTS"; then
detect_mounted_with_proc_mounts
else
error "Cannot detect mounted device \"$VOLUME\""
error "Cannot detect mounted device \"$VOLUME\"."
fi
}
@ -279,14 +277,14 @@ round_up_block_size() {
}
temp_mount() {
dry "$MKDIR" -p -m 0000 "$TEMPDIR" || error "Failed to create $TEMPDIR"
dry "$MOUNT" "$VOLUME" "$TEMPDIR" || error "Failed to mount $TEMPDIR"
dry "$MKDIR" -p -m 0000 "$TEMPDIR" || error "Failed to create $TEMPDIR."
dry "$MOUNT" "$VOLUME" "$TEMPDIR" || error "Failed to mount $TEMPDIR."
}
temp_umount() {
dry "$UMOUNT" "$TEMPDIR" || error "Failed to umount \"$TEMPDIR\""
dry "$RMDIR" "${TEMPDIR}" || error "Failed to remove \"$TEMPDIR\""
dry "$RMDIR" "${TEMPDIR%%m}" || error "Failed to remove \"${TEMPDIR%%m}\""
dry "$UMOUNT" "$TEMPDIR" || error "Failed to umount \"$TEMPDIR\"."
dry "$RMDIR" "${TEMPDIR}" || error "Failed to remove \"$TEMPDIR\","
dry "$RMDIR" "${TEMPDIR%%m}" || error "Failed to remove \"${TEMPDIR%%m}\"."
}
yes_no() {
@ -306,11 +304,11 @@ yes_no() {
try_umount() {
yes_no "Do you want to unmount \"$MOUNTED\"" && dry "$UMOUNT" "$MOUNTED" && return 0
error "Cannot proceed with mounted filesystem \"$MOUNTED\""
error "Cannot proceed with mounted filesystem \"$MOUNTED\"."
}
validate_parsing() {
test -n "$BLOCKSIZE" && test -n "$BLOCKCOUNT" || error "Cannot parse $1 output"
test -n "$BLOCKSIZE" && test -n "$BLOCKCOUNT" || error "Cannot parse $1 output."
}
####################################
# Resize ext2/ext3/ext4 filesystem
@ -380,7 +378,7 @@ resize_xfs() {
MOUNTPOINT=$MOUNTED
if [ -z "$MOUNTED" ]; then
MOUNTPOINT=$TEMPDIR
temp_mount || error "Cannot mount Xfs filesystem"
temp_mount || error "Cannot mount Xfs filesystem."
fi
verbose "Parsing $TUNE_XFS \"$MOUNTPOINT\""
for i in $(LC_ALL=C "$TUNE_XFS" "$MOUNTPOINT"); do
@ -398,7 +396,7 @@ resize_xfs() {
elif [ $NEWBLOCKCOUNT -eq $BLOCKCOUNT ]; then
verbose "Xfs filesystem already has the right size"
else
error "Xfs filesystem shrinking is unsupported"
error "Xfs filesystem shrinking is unsupported."
fi
}
@ -418,8 +416,8 @@ resize() {
"ext3"|"ext2"|"ext4") resize_ext $NEWSIZE ;;
"reiserfs") resize_reiser $NEWSIZE ;;
"xfs") resize_xfs $NEWSIZE ;;
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool" ;;
esac || error "Resize $FSTYPE failed"
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
esac || error "Resize $FSTYPE failed."
cleanup 0
}
@ -500,12 +498,12 @@ for i in "$TUNE_EXT" "$RESIZE_EXT" "$TUNE_REISER" "$RESIZE_REISER" \
test -n "$i" || error "Required command definitions in the script are missing!"
done
"$LVM" version >"$NULL" 2>&1 || error "Could not run lvm binary \"$LVM\""
"$LVM" version >"$NULL" 2>&1 || error "Could not run lvm binary \"$LVM\"."
$("$READLINK" -e / >"$NULL" 2>&1) || READLINK_E="-f"
TEST64BIT=$(( 1000 * 1000000000000 ))
test "$TEST64BIT" -eq 1000000000000000 || error "Shell does not handle 64bit arithmetic"
$(echo Y | "$GREP" Y >"$NULL") || error "Grep does not work properly"
test $("$DATE" -u -d"Jan 01 00:00:01 1970" +%s) -eq 1 || error "Date translation does not work"
test "$TEST64BIT" -eq 1000000000000000 || error "Shell does not handle 64bit arithmetic."
$(echo Y | "$GREP" Y >"$NULL") || error "Grep does not work properly."
test $("$DATE" -u -d"Jan 01 00:00:01 1970" +%s) -eq 1 || error "Date translation does not work."
if [ "$#" -eq 0 ] ; then