Change {nick,}name to alias in all comments and messages
authorBryn M. Reeves <bmr@redhat.com>
Wed, 14 Nov 2012 19:03:19 +0000 (19:03 +0000)
committerBryn M. Reeves <bmr@redhat.com>
Wed, 14 Nov 2012 19:03:19 +0000 (19:03 +0000)
Complete the rename of "name" to "alias"

blkdevalias

index e1da242..af1290f 100755 (executable)
@@ -69,7 +69,7 @@ ba_load_wwid_map() {
     done < $BA_MAP_PATH
 }
 
     done < $BA_MAP_PATH
 }
 
-# ba_add_wwid_mapping <wwid> <nickname> <sd|mpath>
+# ba_add_wwid_mapping <wwid> <alias> <sd|mpath>
 ba_add_wwid_mapping() {
     local WWID
     WWID="$1"
 ba_add_wwid_mapping() {
     local WWID
     WWID="$1"
@@ -81,11 +81,11 @@ ba_add_wwid_mapping() {
         return
     fi
     if [ "$ALIAS" == "" ]; then
         return
     fi
     if [ "$ALIAS" == "" ]; then
-        warn "no nickname given"
+        warn "no alias given"
         return
     fi
     if [ "${NAMEMAP[$WWID]}" != "" ]; then
         return
     fi
     if [ "${NAMEMAP[$WWID]}" != "" ]; then
-        warn "$WWID already mapped to name ${NAMEMAP[$WWID]}; replacing it."
+        warn "$WWID already mapped to alias ${NAMEMAP[$WWID]}; replacing it."
     fi
     WWIDMAP[$WWID]="$ALIAS"
     NAMEMAP[$ALIAS]="$WWID"
     fi
     WWIDMAP[$WWID]="$ALIAS"
     NAMEMAP[$ALIAS]="$WWID"
@@ -161,13 +161,13 @@ EOF
     echo -e "done\n"
 }
 
     echo -e "done\n"
 }
 
-# createdisk <nickname> <device>
+# createdisk <alias> <device>
 ba_createdisk () {
     local WWID DEV ALIAS
     ALIAS="$1"
     DEV="$2"
     if [ "$DEV" == "" ] || [ "$ALIAS" == "" ]; then
 ba_createdisk () {
     local WWID DEV ALIAS
     ALIAS="$1"
     DEV="$2"
     if [ "$DEV" == "" ] || [ "$ALIAS" == "" ]; then
-        echo "Usage: $0 createdisk <nickname> <device>"
+        echo "Usage: $0 createdisk <alias> <device>"
         exit 2
     fi
     debug "ba_createdisk: WWID=\"$WWID\" DEV=\"$DEV\" ALIAS=\"$ALIAS\""
         exit 2
     fi
     debug "ba_createdisk: WWID=\"$WWID\" DEV=\"$DEV\" ALIAS=\"$ALIAS\""
@@ -192,13 +192,13 @@ ba_deletedisk () {
     local WWID ALIAS
     ALIAS=$1
     if [ "$ALIAS" == "" ]; then
     local WWID ALIAS
     ALIAS=$1
     if [ "$ALIAS" == "" ]; then
-        echo "Usage: $0 deletedisk <nickname>"
+        echo "Usage: $0 deletedisk <alias>"
         exit 2
     fi
     WWID=${NAMEMAP[$ALIAS]}
     if [ "$WWID" == "" ]; then
         error "\"$ALIAS\" does not exist"
         exit 2
     fi
     WWID=${NAMEMAP[$ALIAS]}
     if [ "$WWID" == "" ]; then
         error "\"$ALIAS\" does not exist"
-        echo "Usage: $0 deletedisk <nickname>"
+        echo "Usage: $0 deletedisk <alias>"
         exit 2
     fi
     echo -n "Removing wwid map disk \"$ALIAS\":"
         exit 2
     fi
     echo -n "Removing wwid map disk \"$ALIAS\":"
@@ -221,7 +221,7 @@ ba_querydisk () {
     fi
     ALIAS=$1
     if [ "$ALIAS" == "" ]; then
     fi
     ALIAS=$1
     if [ "$ALIAS" == "" ]; then
-        echo "Usage: $0 querydisk <nickname>"
+        echo "Usage: $0 querydisk <alias>"
         exit 2
     fi
     WWID=${NAMEMAP[$ALIAS]}
         exit 2
     fi
     WWID=${NAMEMAP[$ALIAS]}