diff --git a/server/modules/local-accounts-ecrypt/opt/openslx/scripts/systemd-local_accounts-ecrypt b/server/modules/local-accounts-ecrypt/opt/openslx/scripts/systemd-local_accounts-ecrypt index fc4866d765fd4a16e4e701619d022bba0b5ecbe5..37e109641ab4f5ba8fec370684c401c392f5afaf 100755 --- a/server/modules/local-accounts-ecrypt/opt/openslx/scripts/systemd-local_accounts-ecrypt +++ b/server/modules/local-accounts-ecrypt/opt/openslx/scripts/systemd-local_accounts-ecrypt @@ -6,7 +6,7 @@ exec 1<&- exec 2<&- -exec 1<>/root/ecrypt +exec 1<>/var/log/ecrypt exec 2>&1 # check if the /home partition exists diff --git a/server/modules/local-accounts/etc/X11/Xstartup b/server/modules/local-accounts/etc/X11/Xstartup index d2182fd0994fe6c830a46cffb0dd18fe4122a7c0..ecc163f60df3afddf957be5b5ea9b6dbea8fcbe6 100755 --- a/server/modules/local-accounts/etc/X11/Xstartup +++ b/server/modules/local-accounts/etc/X11/Xstartup @@ -6,4 +6,4 @@ # export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" -/opt/openslx/scripts/local-accounts_mount-home.sh >> /root/mountlog 2>&1 +/opt/openslx/scripts/local-accounts_mount-home.sh >> /var/log/mountlog 2>&1 diff --git a/server/modules/local-accounts/opt/openslx/scripts/local-accounts_mount-home.sh b/server/modules/local-accounts/opt/openslx/scripts/local-accounts_mount-home.sh index cb3d028f81f5b8794a1c2fefec03efff51aaaf84..6db32a165301860c472e963f423359b2b782ad30 100755 --- a/server/modules/local-accounts/opt/openslx/scripts/local-accounts_mount-home.sh +++ b/server/modules/local-accounts/opt/openslx/scripts/local-accounts_mount-home.sh @@ -3,7 +3,7 @@ #if vfat, umount and remount everything with the users that is logging #set -x -#echo $USER > /root/logfile +#echo $USER > /var/log/logfile if ( [ ! -e /home/openslx/usb_users/$USER ] ); then exit 0; diff --git a/server/modules/local-accounts/opt/openslx/scripts/local-accounts_remove-udev.sh b/server/modules/local-accounts/opt/openslx/scripts/local-accounts_remove-udev.sh index 6162d77fd544628cbd2358c9d6d87fd8879246ff..ce693081a40d0859ecb5e3fce8ea9e09a167178b 100755 --- a/server/modules/local-accounts/opt/openslx/scripts/local-accounts_remove-udev.sh +++ b/server/modules/local-accounts/opt/openslx/scripts/local-accounts_remove-udev.sh @@ -4,7 +4,7 @@ remove (){ #exec 1<&- #exec 2<&- -#exec 1<>/root/log +#exec 1<>/var/log/local-accounts #exec 2>&1 #set -x @@ -20,11 +20,12 @@ remove (){ fi #umount everything + IFS_bckp=$IFS IFS=$'\n' for i in $(mount | grep $user_drive | sed 's/ type.*//' | cut -d' ' -f3); do umount -f -l $i done - unset IFS + IFS=$IFS_bckp ##Rebuild passwd,shadow,group rm -rf /home/openslx/usb_users/* diff --git a/server/modules/local-accounts/opt/openslx/scripts/local-accounts_udev-caller.sh b/server/modules/local-accounts/opt/openslx/scripts/local-accounts_udev-caller.sh index 48ecbcccc17272f12efa851ded9706fe089ab852..92f7b60a4741b57f0f392cf1a9553e1981421d6f 100755 --- a/server/modules/local-accounts/opt/openslx/scripts/local-accounts_udev-caller.sh +++ b/server/modules/local-accounts/opt/openslx/scripts/local-accounts_udev-caller.sh @@ -1,4 +1,4 @@ #!/bin/sh -/opt/openslx/scripts/local-accounts_insert-data.sh $1 >> /root/local-accounts_insert-data.log & +/opt/openslx/scripts/local-accounts_insert-data.sh $1 >> /var/log/local-accounts_insert-data.log & exit diff --git a/vim.log b/vim.log deleted file mode 100644 index 735a9340dcec0efc79ca150feef278685d2d994e..0000000000000000000000000000000000000000 --- a/vim.log +++ /dev/null @@ -1,282 +0,0 @@ - -chdir(/usr/share/vim) -fchdir() to previous dir -sourcing "$VIM/vimrc" -Searching for "debian.vim" in "/home/michael/.vim,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/debian.vim" -Searching for "/usr/share/vim/vimfiles/debian.vim" -Searching for "/usr/share/vim/vim74/debian.vim" -chdir(/usr/share/vim/vim74) -fchdir() to previous dir -line 10: sourcing "/usr/share/vim/vim74/debian.vim" -finished sourcing /usr/share/vim/vim74/debian.vim -continuing in /usr/share/vim/vimrc -Searching for "/usr/share/vim/vimfiles/after/debian.vim" -Searching for "/home/michael/.vim/after/debian.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 20: sourcing "/usr/share/vim/vim74/syntax/syntax.vim" -Searching for "syntax/synload.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/synload.vim" -Searching for "/var/lib/vim/addons/syntax/synload.vim" -Searching for "/usr/share/vim/vimfiles/syntax/synload.vim" -Searching for "/usr/share/vim/vim74/syntax/synload.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 19: sourcing "/usr/share/vim/vim74/syntax/synload.vim" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 21: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /usr/share/vim/vim74/syntax/synload.vim -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/synload.vim -continuing in /usr/share/vim/vim74/syntax/syntax.vim -Searching for "filetype.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/filetype.vim" -Searching for "/var/lib/vim/addons/filetype.vim" -Searching for "/usr/share/vim/vimfiles/filetype.vim" -Searching for "/usr/share/vim/vim74/filetype.vim" -chdir(/usr/share/vim/vim74) -fchdir() to previous dir -line 25: sourcing "/usr/share/vim/vim74/filetype.vim" -Searching for "ftdetect/*.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/ftdetect/*.vim" -Searching for "/var/lib/vim/addons/ftdetect/*.vim" -Searching for "/usr/share/vim/vimfiles/ftdetect/*.vim" -Searching for "/usr/share/vim/vim74/ftdetect/*.vim" -Searching for "/usr/share/vim/vimfiles/after/ftdetect/*.vim" -Searching for "/var/lib/vim/addons/after/ftdetect/*.vim" -Searching for "/home/michael/.vim/after/ftdetect/*.vim" -not found in 'runtimepath': "ftdetect/*.vim" -finished sourcing /usr/share/vim/vim74/filetype.vim -continuing in /usr/share/vim/vim74/syntax/syntax.vim -Searching for "/usr/share/vim/vimfiles/after/filetype.vim" -Searching for "/var/lib/vim/addons/after/filetype.vim" -Searching for "/home/michael/.vim/after/filetype.vim" -finished sourcing /usr/share/vim/vim74/syntax/syntax.vim -continuing in /usr/share/vim/vimrc -finished sourcing $VIM/vimrc -chdir(/home/michael) -fchdir() to previous dir -sourcing "$HOME/.vimrc" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 2: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /home/michael/.vimrc -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -Searching for "colors/xoria256.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/colors/xoria256.vim" -chdir(/home/michael/.vim/colors) -fchdir() to previous dir -line 2: sourcing "/home/michael/.vim/colors/xoria256.vim" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 27: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /home/michael/.vim/colors/xoria256.vim -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 29: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /home/michael/.vim/colors/xoria256.vim -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 32: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /home/michael/.vim/colors/xoria256.vim -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -finished sourcing /home/michael/.vim/colors/xoria256.vim -continuing in /home/michael/.vimrc -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 3: sourcing "/usr/share/vim/vim74/syntax/syntax.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 15: sourcing "/usr/share/vim/vim74/syntax/nosyntax.vim" -finished sourcing /usr/share/vim/vim74/syntax/nosyntax.vim -continuing in /usr/share/vim/vim74/syntax/syntax.vim -Searching for "syntax/synload.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/synload.vim" -Searching for "/var/lib/vim/addons/syntax/synload.vim" -Searching for "/usr/share/vim/vimfiles/syntax/synload.vim" -Searching for "/usr/share/vim/vim74/syntax/synload.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 19: sourcing "/usr/share/vim/vim74/syntax/synload.vim" -Searching for "colors/xoria256.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/colors/xoria256.vim" -chdir(/home/michael/.vim/colors) -fchdir() to previous dir -line 19: sourcing "/home/michael/.vim/colors/xoria256.vim" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 29: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /home/michael/.vim/colors/xoria256.vim -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/syntax/syncolor.vim" -Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim" -Searching for "/usr/share/vim/vim74/syntax/syncolor.vim" -chdir(/usr/share/vim/vim74/syntax) -fchdir() to previous dir -line 32: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim" -finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim -continuing in /home/michael/.vim/colors/xoria256.vim -Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim" -Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim" -Searching for "/home/michael/.vim/after/syntax/syncolor.vim" -finished sourcing /home/michael/.vim/colors/xoria256.vim -continuing in /usr/share/vim/vim74/syntax/synload.vim -finished sourcing /usr/share/vim/vim74/syntax/synload.vim -continuing in /usr/share/vim/vim74/syntax/syntax.vim -finished sourcing /usr/share/vim/vim74/syntax/syntax.vim -continuing in /home/michael/.vimrc -finished sourcing $HOME/.vimrc -Searching for "plugin/**/*.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/plugin/**/*.vim" -chdir(/home/michael/.vim/plugin) -fchdir() to previous dir -sourcing "/home/michael/.vim/plugin/detectindent.vim" -finished sourcing /home/michael/.vim/plugin/detectindent.vim -Searching for "/var/lib/vim/addons/plugin/**/*.vim" -Searching for "/usr/share/vim/vimfiles/plugin/**/*.vim" -Searching for "/usr/share/vim/vim74/plugin/**/*.vim" -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/getscriptPlugin.vim" -finished sourcing /usr/share/vim/vim74/plugin/getscriptPlugin.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/gzip.vim" -finished sourcing /usr/share/vim/vim74/plugin/gzip.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/matchparen.vim" -finished sourcing /usr/share/vim/vim74/plugin/matchparen.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/netrwPlugin.vim" -finished sourcing /usr/share/vim/vim74/plugin/netrwPlugin.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/rrhelper.vim" -finished sourcing /usr/share/vim/vim74/plugin/rrhelper.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/spellfile.vim" -finished sourcing /usr/share/vim/vim74/plugin/spellfile.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/tarPlugin.vim" -finished sourcing /usr/share/vim/vim74/plugin/tarPlugin.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/tohtml.vim" -finished sourcing /usr/share/vim/vim74/plugin/tohtml.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/vimballPlugin.vim" -finished sourcing /usr/share/vim/vim74/plugin/vimballPlugin.vim -chdir(/usr/share/vim/vim74/plugin) -fchdir() to previous dir -sourcing "/usr/share/vim/vim74/plugin/zipPlugin.vim" -finished sourcing /usr/share/vim/vim74/plugin/zipPlugin.vim -Searching for "/usr/share/vim/vimfiles/after/plugin/**/*.vim" -Searching for "/var/lib/vim/addons/after/plugin/**/*.vim" -Searching for "/home/michael/.vim/after/plugin/**/*.vim" -Reading viminfo file "/home/michael/.viminfo" info oldfiles -chdir(/home/michael/tm-scripts) -fchdir() to previous dir - "vim.log" -"vim.log" [noeol] 206L, 12288C -Reading viminfo file "/home/michael/.viminfo" marks -Searching for "scripts.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after" -Searching for "/home/michael/.vim/scripts.vim" -chdir(/home/michael/.vim) -fchdir() to previous dir -line 0: sourcing "/home/michael/.vim/scripts.vim" -finished sourcing /home/michael/.vim/scripts.vim -continuing in BufRead Auto commands for "*" -Searching for "/var/lib/vim/addons/scripts.vim" -Searching for "/usr/share/vim/vimfiles/scripts.vim" -Searching for "/usr/share/vim/vim74/scripts.vim" -chdir(/usr/share/vim/vim74) -fchdir() to previous dir -line 0: sourcing "/usr/share/vim/vim74/scripts.vim" -finished sourcing /usr/share/vim/vim74/scripts.vim -continuing in BufRead Auto commands for "*" -Searching for "/usr/share/vim/vimfiles/after/scripts.vim" -Searching for "/var/lib/vim/addons/after/scripts.vim" -Searching for "/home/michael/.vim/after/scripts.vim" -; leading_tabs_num: 0, leading_spaces_num: 0, leading_spaces 1: 0, leading_spaces 2: 0, leading_spaces 3: 0, leading_spaces 4: 0, leading_spaces 5: 0, leading_spaces 6: 0, leading_spaces 7: 0, leading_spaces 8: 0 -/.vimrc - -/.vimrc - -/.vimrc - -/.vimrc - -/.vimrc - -/.vimrc - -/.vimrc - -/.vimrc - -/.vimrc --- INSERT -- - - -E492: Not an editor command: Q! - -Writing viminfo file "/home/michael/.viminfo" \ No newline at end of file