diff options
| author | Christian Rößler | 2018-08-06 17:29:00 +0200 |
|---|---|---|
| committer | Christian Rößler | 2018-08-06 17:29:00 +0200 |
| commit | 0cdeb0ae4b79c96c14d92f1c690313782d1d5c0c (patch) | |
| tree | f7d483196274b4ab8b5050d85458accc0582100b /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux | |
| parent | [run-virt] Linux scripts: Another one - it's too hot. (diff) | |
| download | mltk-0cdeb0ae4b79c96c14d92f1c690313782d1d5c0c.tar.gz mltk-0cdeb0ae4b79c96c14d92f1c690313782d1d5c0c.tar.xz mltk-0cdeb0ae4b79c96c14d92f1c690313782d1d5c0c.zip | |
[run-virt] Linux scripts: Links to shares now in desktop directory
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc | 4 | ||||
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc | 23 |
2 files changed, 18 insertions, 9 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc index 939becf6..ad29d78d 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc @@ -2,6 +2,9 @@ LOCALUSER=student USERHOME=/home/"$LOCALUSER" USERHOMEDIR=/home/"$LOCALUSER"/PERSISTENT +USERDESKTOP=$(xdg-user-dir DESKTOP) +[ "$USERDESKTOP" == "" ] && USERDESKTOP="$USERHOME" + DISKMOUNTDIR=/mnt/diskmount SLXCONFIGFILE="$DISKMOUNTDIR"/openslx.ini CONFIGFILE="$DISKMOUNTDIR"/shares.dat @@ -10,6 +13,7 @@ RAWKEYTEMP=$(mktemp -t XXXXXXXXXX.dat) BYTES=256 declare -a ROHSHARES +# Just to be sure... if [ ! $(mount 2>/dev/null | grep -q "$DISKMOUNTDIR") ]; then [ ! -d "$DISKMOUNTDIR" ] && mkdir -p "$DISKMOUNTDIR" mount /dev/fd1 "$DISKMOUNTDIR" 2>/dev/null 1>&2 # Zu erl.: Fehlerfangen diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc index 49cdd947..2336753e 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc @@ -3,14 +3,19 @@ ### Funktionen Mounter ############################ function xor() -{ local RES=($(echo "$1" | sed "s/../0x& /g")) - local ONE=($(echo "$2" | sed "s/../0x& /g")) - local COUNT1=${#RES[@]} - local COUNT2=${#ONE[@]} - for (( i = 0; i < $COUNT1; i++ )); do - RES[$i]=$((${ONE[$(( i % COUNT2 ))]:-0} ^ ${RES[$i]:-0})) - done +{ local LOGDAT=/tmp/getanzahl.pw.$(date +%H%M%S.%N) + echo "Param 1+2: $1 $2" >> $LOGDAT + local RES=($(echo "$1" | sed "s/../0x& /g")) + local ONE=($(echo "$2" | sed "s/../0x& /g")) + local COUNT1=${#RES[@]} + local COUNT2=${#ONE[@]} + echo "count1+2: $COUNT1 -- $COUNT2 ">>"$LOGDAT" + for (( i = 0; i < $COUNT1; i++ )); do + RES[$i]=$((${ONE[$(( i % COUNT2 ))]:-0} ^ ${RES[$i]:-0})) + echo "${RES[$i]}">>"$LOGDAT" + done printf "%02x" "${RES[@]}" + printf "%02x" "${RES[@]}" >>"$LOGDAT" } function already_mounted() @@ -102,8 +107,8 @@ function mount_share() fi if [ "$ERR" -eq 0 ]; then logger "openslx sharemapper: Linking ${SHARELETTER} and $SHARENAME, if possible." - [ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERHOME}"/"$SHARELETTER" - [ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERHOME}"/"$SHARENAME" + [ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER" + [ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME" else logger "openslx sharemapper: deleting previously creates share mount dir $USERSHAREDIR." rmdir "$USERSHAREDIR" 2>/dev/null |