Skip to content

Commit b329822

Browse files
Update all references to HOME with ZUSERHOME and move ZUSERHOME to vzvol main script for early initialization
1 parent 8f4db32 commit b329822

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

bin/vzvol

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ VOLTYPE=NULL
1111
vzvol_libdir=/usr/local/lib/vzvol/lib
1212
vzvol_gitdir=$( find ./ -name "vzvol" | grep bin | sed 's/.\{10\}$//' )
1313
ZUSER="$(logname)"
14+
ZUSERHOME=$( awk -F ":" '/${ZUSER}/{print $6}' < /etc/passwd )
1415

1516

1617
if [ ! "$(whoami)" = 'root' ]; then

lib/shared/vzvol_getargz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ vzvol_getargz() {
101101
return 1
102102
else
103103
DELETE_ME="${2}"
104-
DELETE_VMDK="${HOME}/VBoxDisks/${2}.vmdk"
104+
DELETE_VMDK="${ZUSERHOME}/VBoxDisks/${2}.vmdk"
105105
vzvol_delete || exit 1
106106
exit
107107
fi

lib/shared/vzvol_list.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ vzvol_list_type() {
3939
else
4040
zvolfstype="unknown"
4141
fi
42-
if [ -f "${HOME}/VBoxdisks/${purevolname}.vmdk" ]; then
43-
echo "${vols} VirtualBox ${HOME}/VBoxdisks/${purevolname}.vmdk $purevolused $purevolsize $zvolfstype"
42+
if [ -f "${ZUSERHOME}/VBoxdisks/${purevolname}.vmdk" ]; then
43+
echo "${vols} VirtualBox ${ZUSERHOME}/VBoxdisks/${purevolname}.vmdk $purevolused $purevolsize $zvolfstype"
4444
else
4545
echo "${vols} RAW none $purevolused $purevolsize $zvolfstype"
4646
fi

lib/shared/vzvol_type.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ zvol_type_virtualbox() {
1111
errorfunc='zvol_type_virtualbox'
1212
zvol_create || return 1
1313
vmdk_create || return 1
14-
echo "Please use ${HOME}/VBoxdisks/${VOLNAME}.vmdk as your VM Disk"
14+
echo "Please use ${ZUSERHOME}/VBoxdisks/${VOLNAME}.vmdk as your VM Disk"
1515
}
1616
zvol_type_raw() {
1717
errorfunc='zvol_type_raw'

lib/shared/vzvol_vmdk.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/sh
22
vmdk_create() {
3-
ZUSERHOME=$( awk -F ":" '/${ZUSER}/{print $6}' < /etc/passwd )
43
errorfunc='vmdk_create'
54
if [ ! -d "${ZUSERHOME}"/VBoxdisks/ ]; then
65
mkdir -p "${ZUSERHOME}"/VBoxdisks/

0 commit comments

Comments
 (0)