shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-31 05:47:43 +03:00
Code Releases Activity

fsadm: use NULL

Browse Source 
Use consistently $NULL as in other places.
This commit is contained in:
Zdenek Kabelac 2020-10-24 00:40:34 +02:00
parent e478ef2f59
commit ee2c80133c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/fsadm.sh
View File

@ -233,8 +233,8 @@ validate_mounted_major_minor() {
test "$1" = "$MAJORMINOR" || { test "$1" = "$MAJORMINOR" || {
local REFNAME local REFNAME
local CURNAME local CURNAME
REFNAME=$(dmsetup info -c -j "${1%%:*}" -m "${1##*:}" -o name --noheadings 2>/dev/null) REFNAME=$(dmsetup info -c -j "${1%%:*}" -m "${1##*:}" -o name --noheadings 2>"$NULL")
CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings 2>/dev/null) CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings 2>"$NULL")
error "Cannot ${CHECK+CHECK}${RESIZE+RESIZE} device \"$VOLUME\" without umounting filesystem $MOUNTED first." \ error "Cannot ${CHECK+CHECK}${RESIZE+RESIZE} device \"$VOLUME\" without umounting filesystem $MOUNTED first." \
"Mounted filesystem is using device $CURNAME, but referenced device is $REFNAME." \ "Mounted filesystem is using device $CURNAME, but referenced device is $REFNAME." \
"Filesystem utilities currently do not support renamed devices." "Filesystem utilities currently do not support renamed devices."
@ -279,7 +279,7 @@ check_valid_mounted_device() {
detect_mounted_with_proc_self_mountinfo() { detect_mounted_with_proc_self_mountinfo() {
# Check self mountinfo # Check self mountinfo
# grab major:minor mounted_device mount_point # grab major:minor mounted_device mount_point
MOUNTED=$("$GREP" "^[0-9]* [0-9]* $MAJORMINOR " "$PROCSELFMOUNTINFO" 2>/dev/null | head -1) MOUNTED=$("$GREP" "^[0-9]* [0-9]* $MAJORMINOR " "$PROCSELFMOUNTINFO" 2>"$NULL" | head -1)
# If device is opened and not yet found as self mounted # If device is opened and not yet found as self mounted
# check all other mountinfos (since it can be mounted in cgroups) # check all other mountinfos (since it can be mounted in cgroups)
@ -287,7 +287,7 @@ detect_mounted_with_proc_self_mountinfo() {
# only 1st. line is needed # only 1st. line is needed
test -z "$MOUNTED" && test -z "$MOUNTED" &&
test "$(dmsetup info -c --noheading -o open -j "$MAJOR" -m "$MINOR")" -gt 0 && test "$(dmsetup info -c --noheading -o open -j "$MAJOR" -m "$MINOR")" -gt 0 &&
MOUNTED=$(find "$PROCDIR" -maxdepth 2 -name mountinfo -print0 | xargs -0 "$GREP" "^[0-9]* [0-9]* $MAJORMINOR " 2>/dev/null | head -1 2>/dev/null) MOUNTED=$(find "$PROCDIR" -maxdepth 2 -name mountinfo -print0 | xargs -0 "$GREP" "^[0-9]* [0-9]* $MAJORMINOR " 2>"$NULL" | head -1 2>"$NULL")
# TODO: for performance compare with sed and stop with 1st. match: # TODO: for performance compare with sed and stop with 1st. match:
# sed -n "/$MAJORMINOR/ {;p;q;}" # sed -n "/$MAJORMINOR/ {;p;q;}"
@ -532,7 +532,7 @@ detect_luks_device() {
CRYPT_NAME="" CRYPT_NAME=""
CRYPT_DATA_OFFSET="" CRYPT_DATA_OFFSET=""
_LUKS_VERSION=$("$CRYPTSETUP" luksDump "$VOLUME" 2> /dev/null | "$GREP" "Version:") _LUKS_VERSION=$("$CRYPTSETUP" luksDump "$VOLUME" 2>"$NULL" | "$GREP" "Version:")
if [ -z "$_LUKS_VERSION" ]; then if [ -z "$_LUKS_VERSION" ]; then
verbose "Failed to parse LUKS version on volume \"$VOLUME\"" verbose "Failed to parse LUKS version on volume \"$VOLUME\""
@ -541,7 +541,7 @@ detect_luks_device() {
_LUKS_VERSION=${_LUKS_VERSION//[Version:[:space:]]/} _LUKS_VERSION=${_LUKS_VERSION//[Version:[:space:]]/}
_LUKS_UUID=$("$CRYPTSETUP" luksDump "$VOLUME" 2> /dev/null | "$GREP" "UUID:") _LUKS_UUID=$("$CRYPTSETUP" luksDump "$VOLUME" 2>"$NULL" | "$GREP" "UUID:")
if [ -z "$_LUKS_UUID" ]; then if [ -z "$_LUKS_UUID" ]; then
verbose "Failed to parse LUKS UUID on volume \"$VOLUME\"" verbose "Failed to parse LUKS UUID on volume \"$VOLUME\""
@ -612,9 +612,9 @@ detect_crypt_device() {
local L_NEWSIZE local L_NEWSIZE
local TMP local TMP
which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize crypt device" which "$CRYPTSETUP" >"$NULL" 2>&1 || error "$CRYPTSETUP utility required to resize crypt device"
CRYPT_TYPE=$("$CRYPTSETUP" status "$1" 2> /dev/null | "$GREP" "type:") CRYPT_TYPE=$("$CRYPTSETUP" status "$1" 2>"$NULL" | "$GREP" "type:")
test -n "$CRYPT_TYPE" || error "$CRYPTSETUP failed to detect device type on $1." test -n "$CRYPT_TYPE" || error "$CRYPTSETUP failed to detect device type on $1."
@ -674,7 +674,7 @@ resize() {
"reiserfs") resize_reiser $NEWSIZE ;; "reiserfs") resize_reiser $NEWSIZE ;;
"xfs") resize_xfs $NEWSIZE ;; "xfs") resize_xfs $NEWSIZE ;;
"crypto_LUKS") "crypto_LUKS")
which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume" which "$CRYPTSETUP" >"$NULL" 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume"
resize_luks $NEWSIZE ;; resize_luks $NEWSIZE ;;
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
esac || error "Resize $FSTYPE failed." esac || error "Resize $FSTYPE failed."
@ -746,7 +746,7 @@ check() {
*) dry "$FSCK" $FORCE -p "$VOLUME" ;; *) dry "$FSCK" $FORCE -p "$VOLUME" ;;
esac ;; esac ;;
"crypto_LUKS") "crypto_LUKS")
which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required." which "$CRYPTSETUP" >"$NULL" 2>&1 || error "$CRYPTSETUP utility required."
check_luks ;; check_luks ;;
*) *)
error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;