Merge branch 'bugfix-1.9.2' into feature-lxc
finished bugfix-1.9.2
This commit is contained in:
commit
d4b7654769
BIN
doc/Server Bedienung.odt
Normal file
BIN
doc/Server Bedienung.odt
Normal file
Binary file not shown.
BIN
doc/Server Bedienung.pdf
Normal file
BIN
doc/Server Bedienung.pdf
Normal file
Binary file not shown.
5
src/func/check_dependency
Normal file → Executable file
5
src/func/check_dependency
Normal file → Executable file
@ -13,3 +13,8 @@ function check_dependency() {
|
|||||||
done
|
done
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/check_user
Normal file → Executable file
5
src/func/check_user
Normal file → Executable file
@ -10,3 +10,8 @@ function check_user() {
|
|||||||
return 10
|
return 10
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/chroot_clean
Normal file → Executable file
5
src/func/chroot_clean
Normal file → Executable file
@ -15,3 +15,8 @@ function chroot_clean() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/chroot_initial
Normal file → Executable file
5
src/func/chroot_initial
Normal file → Executable file
@ -26,3 +26,8 @@ function chroot_initial() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/chroot_is_mounted
Normal file → Executable file
5
src/func/chroot_is_mounted
Normal file → Executable file
@ -18,3 +18,8 @@ function chroot_is_mounted() {
|
|||||||
echo "true"
|
echo "true"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/chroot_sh
Normal file → Executable file
5
src/func/chroot_sh
Normal file → Executable file
@ -22,3 +22,8 @@ function chroot_sh() {
|
|||||||
|
|
||||||
chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; $command"
|
chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; $command"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/chroot_umount
Normal file → Executable file
5
src/func/chroot_umount
Normal file → Executable file
@ -24,3 +24,8 @@ function chroot_umount() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/error_code
Normal file → Executable file
5
src/func/error_code
Normal file → Executable file
@ -58,3 +58,8 @@ function error_code() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/filesystem_extract
Normal file → Executable file
5
src/func/filesystem_extract
Normal file → Executable file
@ -41,3 +41,8 @@ function filesystem_extract() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/filesystem_get_type
Normal file → Executable file
5
src/func/filesystem_get_type
Normal file → Executable file
@ -8,3 +8,8 @@ function filesystem_get_type() {
|
|||||||
fs_aTemp=(`df -T "$1"`)
|
fs_aTemp=(`df -T "$1"`)
|
||||||
echo ${fs_aTemp[9]}
|
echo ${fs_aTemp[9]}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/filesystem_pack
Normal file → Executable file
5
src/func/filesystem_pack
Normal file → Executable file
@ -30,3 +30,8 @@ function filesystem_pack() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/iso_create
Normal file → Executable file
5
src/func/iso_create
Normal file → Executable file
@ -24,3 +24,8 @@ function iso_create() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/iso_extract
Normal file → Executable file
5
src/func/iso_extract
Normal file → Executable file
@ -45,3 +45,8 @@ function iso_extract() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/on_exit
Normal file → Executable file
5
src/func/on_exit
Normal file → Executable file
@ -27,3 +27,8 @@ function on_exit() {
|
|||||||
}
|
}
|
||||||
exit $1
|
exit $1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/func/workspace_erase
Normal file → Executable file
5
src/func/workspace_erase
Normal file → Executable file
@ -15,3 +15,8 @@ function workspace_erase() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
16
src/mods/xrdp
Normal file → Executable file
16
src/mods/xrdp
Normal file → Executable file
@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#remaster lib
|
||||||
|
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## ...
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
5
src/proj/debian
Normal file → Executable file
5
src/proj/debian
Normal file → Executable file
@ -35,3 +35,8 @@ function os_update() {
|
|||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/proj/desinfect.17
Normal file → Executable file
5
src/proj/desinfect.17
Normal file → Executable file
@ -7,3 +7,8 @@
|
|||||||
source <LIBDIR>/proj/ubuntu.16.04
|
source <LIBDIR>/proj/ubuntu.16.04
|
||||||
|
|
||||||
TEST2="na"
|
TEST2="na"
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/proj/ubuntu
Normal file → Executable file
5
src/proj/ubuntu
Normal file → Executable file
@ -7,3 +7,8 @@
|
|||||||
####################################
|
####################################
|
||||||
# . -> debian
|
# . -> debian
|
||||||
source <LIBDIR>/proj/debian
|
source <LIBDIR>/proj/debian
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
5
src/proj/ubuntu.16.04
Normal file → Executable file
5
src/proj/ubuntu.16.04
Normal file → Executable file
@ -5,3 +5,8 @@
|
|||||||
#ubuntu.16.04
|
#ubuntu.16.04
|
||||||
# . -> ubuntu -> debian
|
# . -> ubuntu -> debian
|
||||||
source <LIBDIR>/proj/ubuntu
|
source <LIBDIR>/proj/ubuntu
|
||||||
|
|
||||||
|
[ -n "$1" ] && {
|
||||||
|
echo param
|
||||||
|
$1
|
||||||
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#@version 1.9.1
|
#@version 1.9.2
|
||||||
#@autor 6543@obermui.de
|
#@autor 6543@obermui.de
|
||||||
#@date 2018-04-26
|
#@date 2018-05-10
|
||||||
#@licence GNUv3
|
#@licence GNUv3
|
||||||
|
|
||||||
#####################################################################################
|
#####################################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user