diff --git a/create-lx-container.sh b/create-lx-container.sh index b23e8eb..be949a1 100755 --- a/create-lx-container.sh +++ b/create-lx-container.sh @@ -203,20 +203,26 @@ else fi clear -echo -e " \033[32m---\033[m" -echo -e " \033[32m\033[1mInsert parameter for the new LX Container\033[m" -echo -e " \033[32m---\033[m" -echo -echo " # Insert root directory for LX Containers." -echo " #" -echo " # Type to accept the default '$DEFAULT_LXC_ROOT_DIR'." -echo "" -echononl "\033[1mRoot directory for LX Containers [$DEFAULT_LXC_ROOT_DIR]:\033[m " -read LXC_ROOT_DIR -if [[ -z "$(trim $LXC_ROOT_DIR)" ]] ; then - LXC_ROOT_DIR="$DEFAULT_LXC_ROOT_DIR" -fi +#echo -e " \033[32m---\033[m" +#echo -e " \033[32m\033[1mInsert parameter for the new LX Container\033[m" +#echo -e " \033[32m---\033[m" +#echo +# +#echo " # Insert base directory for LX Containers." +#echo " #" +#echo " # Type to accept the default '$DEFAULT_LXC_ROOT_DIR'." +#echo "" +#echononl "\033[1mRoot directory for LX Containers [$DEFAULT_LXC_ROOT_DIR]:\033[m " +#read LXC_ROOT_DIR +#if [[ -z "$(trim $LXC_ROOT_DIR)" ]] ; then +# LXC_ROOT_DIR="$DEFAULT_LXC_ROOT_DIR" +#fi + +# - We won't change the default. Realise different container directories +# - by using symlinks. +# - +LXC_ROOT_DIR="$DEFAULT_LXC_ROOT_DIR" echo "" echo -e "\033[32m--\033[m" @@ -240,6 +246,22 @@ echo "" echo -e "\033[32m--\033[m" echo "" +DEFAULT_LXC_CONTAINER_DIR="${DEFAULT_LXC_ROOT_DIR}/$LXC_NAME" + +echo -e " # Insert root directory for the new LX Container \033[1m$LXC_NAME\\033[m." +echo " #" +echo " # Type to accept the default '$DEFAULT_LXC_CONTAINER_DIR'." +echo "" +echononl "\033[1mRoot directory for LX Containers [$DEFAULT_LXC_CONTAINER_DIR]:\033[m " +read LXC_CONTAINER_DIR +if [[ -z "$(trim $LXC_CONTAINER_DIR)" ]] ; then + LXC_CONTAINER_DIR="$LXC_CONTAINER_DIR" +fi + +echo "" +echo -e "\033[32m--\033[m" +echo "" + echo " # Insert linux distribution for the new LX Containers." echo " #" echo " # Type to accept the default '$DEFAULT_LXC_DIST'." @@ -483,16 +505,6 @@ if [[ "${IPV6_ADDRESS_1,,}" = 'none' ]] ; then IPV6_ADDRESS_1="" fi -#while ! $(is_valid_ipv6 $IPV6_ADDRESS_1); do -# if [[ -z "$(trim $IPV6_ADDRESS_1)" ]]; then -# warn "Parameter is needed. Try again.." -# else -# warn "'$IPV6_ADDRESS_1' is not a valid IPv6 Address. Try again.." -# fi -# echononl "\033[1mFirst IPv6 Address:\033[m " -# read IPV6_ADDRESS_1 -#done - if [[ -n "$IPV6_ADDRESS_1" ]] ; then echo "" echo -e "\033[32m--\033[m" @@ -511,16 +523,6 @@ if [[ -n "$IPV6_ADDRESS_1" ]] ; then done fi -#while ! $(is_valid_ipv4 $IPV6_GATEWAY_1) ; do -# if [[ -z "$(trim $IPV6_GATEWAY_1)" ]]; then -# warn "Parameter is needed. Try again" -# else -# warn "'$IPV6_GATEWAY_1' is not a valid IPv6 Address. Try again.." -# fi -# echononl "\033[1mIPv6 (first) Gateway Address:\033[m " -# read IPV6_GATEWAY_1 -#done - echo "" echo -e "\033[32m--\033[m" @@ -543,37 +545,38 @@ HOSTNAME="$(echo "$FQ_HOSTNAME" | cut -f1 -d'.')" echo "" echo "" echo -e " \033[32m---\033[m" -echo -e " \033[32m\033[1mParameter Summary\033[m" +echo -e " \033[32m\033[1mParameter Summary - create new LX Container \033[m\033[1m$LXC_NAME\033[m" echo -e " \033[32m---\033[m" echo "" -echo " Root directory LX Container..........: $LXC_ROOT_DIR" +echo " Base directory LX Containers.............: $LXC_ROOT_DIR" +echo " Root directory new LX Container..........: $LXC_CONTAINER_DIR" echo "" -echo " Name of the new LX Container.........: $LXC_NAME" -echo " Linux distribution...................: $LXC_DIST" -echo " Code name (or release number)........: $LXC_RELEASE" +echo " Name of the new LX Container.............: $LXC_NAME" +echo " Linux distribution.......................: $LXC_DIST" +echo " Code name (or release number)............: $LXC_RELEASE" echo "" -echo " MAC Address (first) network device...: $MAC_ADDRESS_1" -echo " IPv4 Address (first).................: $IPV4_ADDRESS_1" -echo " IPv4 Gateway Address (first).........: $IPV4_GATEWAY_1" +echo " MAC Address (first) network device.......: $MAC_ADDRESS_1" +echo " IPv4 Address (first).....................: $IPV4_ADDRESS_1" +echo " IPv4 Gateway Address (first).............: $IPV4_GATEWAY_1" if [[ -n "$IPV6_ADDRESS_1" ]] ; then - echo " IPv6 Address (first).................: $IPV6_ADDRESS_1" - echo " IPv6 Gateway Address (first).........: $IPV6_GATEWAY_1" + echo " IPv6 Address (first).....................: $IPV6_ADDRESS_1" + echo " IPv6 Gateway Address (first).............: $IPV6_GATEWAY_1" else - echo -e " IPv6 Address (first).................: - \033[33mNot set\033[m - " + echo -e " IPv6 Address (first).....................: - \033[33mNot set\033[m - " fi -echo " Netmask first IPv4 Address...........: $IPV4_NETMASK_1" -echo " CIDR (IPv4 Prefix) of netmask........: $IPV4_PREFIX_1" +echo " Netmask first IPv4 Address...............: $IPV4_NETMASK_1" +echo " CIDR (IPv4 Prefix) of netmask............: $IPV4_PREFIX_1" if $_second_ipv4 ; then echo "" - echo " MAC Address (second) network device..: $MAC_ADDRESS_2" - echo " IPv4 Address (second)................: $IPV4_ADDRESS_2" - echo " IPv4 Gateway Address (second)........: $IPV4_GATEWAY_2" - echo " Netmask second IPv4 Address..........: $IPV4_NETMASK_2" - echo " CIDR (IPv4 Prefix) of netmask........: $IPV4_PREFIX_2" + echo " MAC Address (second) network device......: $MAC_ADDRESS_2" + echo " IPv4 Address (second)....................: $IPV4_ADDRESS_2" + echo " IPv4 Gateway Address (second)............: $IPV4_GATEWAY_2" + echo " Netmask second IPv4 Address..............: $IPV4_NETMASK_2" + echo " CIDR (IPv4 Prefix) of netmask............: $IPV4_PREFIX_2" fi echo "" -echo " Hostname.............................: $HOSTNAME" -echo " Full qualified hostname..............: $FQ_HOSTNAME" +echo " Hostname.................................: $HOSTNAME" +echo " Full qualified hostname..................: $FQ_HOSTNAME" echo "" echononl "\033[1mStart creation script with this parameters [yes/no]:\033[m " @@ -583,10 +586,114 @@ read OK echo "" + # --- # - Create the base container # --- +echo "" +echo "" +echo -e " \033[37m\033[1mPreinstallation task....\033[m" +echo "" + +if [[ "$(dirname "$LXC_CONTAINER_DIR")" != "$LXC_ROOT_DIR" ]]; then + + msg="Create directory '$(dirname "$LXC_CONTAINER_DIR")'.." + _dir="$(dirname "$LXC_CONTAINER_DIR")" + if [[ ! -d "$_dir" ]] ; then + mkdir "$_dir" > /dev/null 2>$err_msg + if [[ $? -eq 0 ]] ; then + msg_ok="Directory '${_dir}' created." + length_msg_ok=${#msg_ok} + blank_signs="" + if [[ $length_msg -gt $length_msg_ok ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_ok) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" + else + msg_failed="Creation of directory '$_dir' failed!" + length_msg_failed=${#msg_failed} + blank_signs="" + if [[ $length_msg -gt $length_msg_failed ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_failed) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[31m\033[1mfailed\033[m ] ${msg_failed}${blank_signs}" + fatal "$(cat $err_msg)" + fi + else + msg_skipped="Directory '$_dir' already exists." + length_msg_skipped=${#msg_skipped} + blank_signs="" + if [[ $length_msg -gt $length_msg_skipped ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_skipped) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[33m\033[1mskip\033[m ] ${msg_skipped}${blank_signs}" + + if [[ -d "$LXC_CONTAINER_DIR" ]] ; then + + if [[ "$(ls -A $LXC_CONTAINER_DIR)" ]]; then + fatal "Container directory "$LXC_CONTAINER_DIR" exists but is not empty.." + else + msg="Remove empty directory '${LXC_CONTAINER_DIR}'.." + rmdir "${LXC_CONTAINER_DIR}" > /dev/null 2>$err_msg + if [[ $? -eq 0 ]] ; then + msg_ok="(Empty) directory '${LXC_CONTAINER_DIR}' removed.." + length_msg_ok=${#msg_ok} + blank_signs="" + if [[ $length_msg -gt $length_msg_ok ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_ok) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" + else + msg_failed="Removing directory '${LXC_CONTAINER_DIR}' failed!" + length_msg_failed=${#msg_failed} + blank_signs="" + if [[ $length_msg -gt $length_msg_failed ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_failed) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[31m\033[1mfailed\033[m ] ${msg_failed}${blank_signs}" + fatal "$(cat $err_msg)" + fi + fi # if [[ "$(ls -A $LXC_CONTAINER_DIR)" ]]; then + + fi # if [[ -d "$LXC_CONTAINER_DIR" ]] + + fi # if [[ ! -d "$_dir" ]] ; then + +fi # if [[ "$(dirname "$LXC_CONTAINER_DIR")" != "$LXC_ROOT_DIR" ]]; then + + +# - Prevent script from installing into an existing Container dir. +# - +if [[ -d "${LXC_CONTAINER_DIR}" ]] ; then + fatal "Container directory '$LXC_CONTAINER_DIR' already exists." +fi + echo "" echo "" echo -e " \033[37m\033[1mCreate the base container..\033[m" @@ -596,7 +703,8 @@ msg="Create Lx Container '$LXC_NAME' .." length_msg=${#msg} echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -lxc-create -n $LXC_NAME -t $LXC_DIST -- --release $LXC_RELEASE --arch amd64 > /dev/null 2> $err_msg +lxc-create -n $LXC_NAME -t $LXC_DIST -P "$(dirname "$LXC_CONTAINER_DIR")" -- \ + --release $LXC_RELEASE --arch amd64 > /dev/null 2> $err_msg if [[ $? -eq 0 ]] ; then msg_ok="Lx Container 'LXC_NAME' created." @@ -624,7 +732,7 @@ else done fi echo -e "\033[1G [ \033[31m\033[1mfailed\033[m ] ${msg_failed}${blank_signs}" - error "$(cat $err_msg)" + fatal "$(cat $err_msg)" fi @@ -637,16 +745,56 @@ echo "" echo -e " \033[37m\033[1mConfigure the new LX Container..\033[m" echo "" -# - Create an empty fstab '${LXC_ROOT_DIR}/${LXC_NAME}/fstab' + +if [[ "$(dirname "$LXC_CONTAINER_DIR")" != "$LXC_ROOT_DIR" ]]; then + + + msg="Create a symlink '${LXC_ROOT_DIR}/${LXC_NAME}' --> '${LXC_CONTAINER_DIR}' .." + length_msg=${#msg} + echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" + ln -s ${LXC_CONTAINER_DIR} ${LXC_ROOT_DIR}/${LXC_NAME} > /dev/null 2>$err_msg + + if [[ $? -eq 0 ]] ; then + msg_ok="Symlink '${LXC_ROOT_DIR}/${LXC_NAME}' --> '${LXC_CONTAINER_DIR}' created." + length_msg_ok=${#msg_ok} + blank_signs="" + if [[ $length_msg -gt $length_msg_ok ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_ok) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" + else + msg_failed="Creation of symlink '${LXC_ROOT_DIR}/${LXC_NAME}' --> '${LXC_CONTAINER_DIR}' failed!" + length_msg_failed=${#msg_failed} + blank_signs="" + if [[ $length_msg -gt $length_msg_failed ]]; then + number_blank_sign=$(expr $length_msg - $length_msg_failed) + index_i=0 + while [[ $index_i -lt $number_blank_sign ]] ; do + blank_signs="$blank_signs " + (( index_i++ )) + done + fi + echo -e "\033[1G [ \033[31m\033[1mfailed\033[m ] ${msg_failed}${blank_signs}" + fatal "$(cat $err_msg)" + fi +fi + + +# - Create an empty fstab '${LXC_CONTAINER_DIR}/fstab' # - -msg="Create an empty file '${LXC_ROOT_DIR}/${LXC_NAME}/fstab' .." +msg="Create an empty file '${LXC_CONTAINER_DIR}/fstab' .." length_msg=${#msg} echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -touch ${LXC_ROOT_DIR}/${LXC_NAME}/fstab > /dev/null 2>$err_msg +touch ${LXC_CONTAINER_DIR}/fstab > /dev/null 2>$err_msg if [[ $? -eq 0 ]] ; then - msg_ok="Empty file '${LXC_ROOT_DIR}/${LXC_NAME}' created." + msg_ok="Empty file '${LXC_CONTAINER_DIR}' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -659,7 +807,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Creation of (empty) file '${LXC_ROOT_DIR}/${LXC_NAME}/fstab' failed!" + msg_failed="Creation of (empty) file '${LXC_CONTAINER_DIR}/fstab' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -676,14 +824,14 @@ fi # - Backup original configuration file # - -msg="Backup original Container configuration file '${LXC_ROOT_DIR}/${LXC_NAME}/config' .." +msg="Backup original Container configuration file '${LXC_CONTAINER_DIR}/config' .." length_msg=${#msg} echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -cp ${LXC_ROOT_DIR}/${LXC_NAME}/config ${LXC_ROOT_DIR}/${LXC_NAME}/config.ORIG +cp ${LXC_CONTAINER_DIR}/config ${LXC_CONTAINER_DIR}/config.ORIG if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/config.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/config.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -696,7 +844,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/config'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/config'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -713,19 +861,19 @@ fi # - Create the Container configuration file # - -msg="Create Container Configuration '${LXC_ROOT_DIR}/${LXC_NAME}/config' .." +msg="Create Container Configuration '${LXC_CONTAINER_DIR}/config' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" _failed=false -cat << EOF > ${LXC_ROOT_DIR}/${LXC_NAME}/config 2> $err_msg -lxc.rootfs = /var/lib/lxc/${LXC_NAME}/rootfs +cat << EOF > ${LXC_CONTAINER_DIR}/config 2> $err_msg +lxc.rootfs = ${LXC_CONTAINER_DIR}/rootfs # Common configuration lxc.include = /usr/share/lxc/config/${LXC_DIST}.common.conf # Container specific configuration -lxc.mount = /var/lib/lxc/${LXC_NAME}/fstab +lxc.mount = ${LXC_CONTAINER_DIR}/fstab lxc.utsname = $LXC_NAME lxc.arch = amd64 lxc.autodev = 1 @@ -746,12 +894,12 @@ lxc.network.ipv4.gateway = ${IPV4_GATEWAY_1} # IPv6 EOF if [[ -n "${IPV6_ADDRESS_1}" ]] ; then - cat << EOF >> ${LXC_ROOT_DIR}/${LXC_NAME}/config 2>> $err_msg + cat << EOF >> ${LXC_CONTAINER_DIR}/config 2>> $err_msg lxc.network.ipv6 = ${IPV6_ADDRESS_1}/$IPV6_PREFIX_1 lxc.network.ipv6.gateway = $IPV6_GATEWAY_1 EOF else - cat << EOF >> ${LXC_ROOT_DIR}/${LXC_NAME}/config 2>> $err_msg + cat << EOF >> ${LXC_CONTAINER_DIR}/config 2>> $err_msg #lxc.network.ipv6 = ${IPV6_ADDRESS_1}/$IPV6_PREFIX_1 #lxc.network.ipv6.gateway = $IPV6_GATEWAY_1 EOF @@ -763,7 +911,7 @@ if [[ $? -ne 0 ]]; then fi if [[ -n "$IPV4_ADDRESS_2" ]]; then - cat << EOF >> ${LXC_ROOT_DIR}/${LXC_NAME}/config 2>> $err_msg + cat << EOF >> ${LXC_CONTAINER_DIR}/config 2>> $err_msg ### Device 2 lxc.network.type = veth lxc.network.flags = up @@ -775,11 +923,11 @@ lxc.network.ipv4 = ${IPV4_ADDRESS_2}/$IPV4_PREFIX_2 ## IPv6 EOF if [[ -n "$IPV4_ADDRESS_2" ]]; then - cat << EOF >> ${LXC_ROOT_DIR}/${LXC_NAME}/config 2>> $err_msg + cat << EOF >> ${LXC_CONTAINER_DIR}/config 2>> $err_msg #lxc.network.ipv6 = ${IPV6_ADDRESS_2}/$IPV6_PREFIX_2 EOF else - cat << EOF >> ${LXC_ROOT_DIR}/${LXC_NAME}/config 2>> $err_msg + cat << EOF >> ${LXC_CONTAINER_DIR}/config 2>> $err_msg lxc.network.ipv6 = ${IPV6_ADDRESS_2}/$IPV6_PREFIX_2 EOF @@ -790,7 +938,7 @@ EOF fi fi -cat << EOF >> ${LXC_ROOT_DIR}/${LXC_NAME}/config 2>> $err_msg +cat << EOF >> ${LXC_CONTAINER_DIR}/config 2>> $err_msg # Mount iso file inside LX Container #lxc.aa_profile = unconfined @@ -808,7 +956,7 @@ if [[ $? -ne 0 ]]; then fi if $_failed ; then - msg_failed="Creation of '${LXC_ROOT_DIR}/${LXC_NAME}/config' failed!" + msg_failed="Creation of '${LXC_CONTAINER_DIR}/config' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -822,7 +970,7 @@ if $_failed ; then echo -e "\033[1G [ \033[31m\033[1mfailed\033[m ] ${msg_failed}${blank_signs}" error "$(cat $err_msg)" else - msg_ok="Container Configuration '${LXC_ROOT_DIR}/${LXC_NAME}/config' created." + msg_ok="Container Configuration '${LXC_CONTAINER_DIR}/config' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -850,14 +998,14 @@ echo "" # - Backup file '/etc/network/interfaces' inside the Container # - -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces' .." +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -cp ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces \ - ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces.ORIG +cp ${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces \ + ${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces.ORIG if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -870,7 +1018,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -888,12 +1036,12 @@ fi # - Create Containers network configuration # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" _failed=false if [[ -z "$IPV4_ADDRESS_2" ]] ; then - cat << EOF > ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces + cat << EOF > ${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces #----------------------------- # lo: loopback @@ -915,7 +1063,7 @@ EOF fi else - cat << EOF > ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces 2> $err_msg + cat << EOF > ${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces 2> $err_msg #----------------------------- # lo: loopback @@ -949,7 +1097,7 @@ EOF fi if $_failed ; then - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -963,7 +1111,7 @@ if $_failed ; then echo -e "\033[1G [ \033[31m\033[1mfailed\033[m ] ${msg_failed}${blank_signs}" error "$(cat $err_msg)" else - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/network/interfaces' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/etc/network/interfaces' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -988,14 +1136,14 @@ echo "" echo -e " \033[37m\033[1mSome post-installation tasks inside the new LX Container '${LXC_NAME}' ..\033[m" echo "" -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list' .." -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list.ORIG" > $err_msg 2>&1 +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list' .." +mv "${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list" "${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list.ORIG" > $err_msg 2>&1 # - Backup 'sources.list'-file. # - if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list.ORIG' created." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list.ORIG' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1008,7 +1156,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Backup of file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list' failed!" + msg_failed="Backup of file '${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1026,8 +1174,8 @@ fi # - Create new 'sources.list'-file. # - -msg="Create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list' .." -cat << EOF > ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list 2> $err_msg +msg="Create file '${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list' .." +cat << EOF > ${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list 2> $err_msg deb http://ftp.de.debian.org/debian/ $LXC_RELEASE main non-free contrib deb-src http://ftp.de.debian.org/debian/ $LXC_RELEASE main non-free contrib @@ -1046,7 +1194,7 @@ deb-src http://ftp.de.debian.org/debian/ $LXC_RELEASE-backports main contrib non EOF if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1059,7 +1207,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Creation of file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/apt/sources.list' failed!" + msg_failed="Creation of file '${LXC_CONTAINER_DIR}/rootfs/etc/apt/sources.list' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1081,10 +1229,10 @@ echo "" msg="Move Symlink '/bin/sh' to '/bin/sh.ORIG' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/bin/sh" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/bin/sh.ORIG" > $err_msg 2>&1 +mv "${LXC_CONTAINER_DIR}/rootfs/bin/sh" "${LXC_CONTAINER_DIR}/rootfs/bin/sh.ORIG" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="Symlink '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/bin/sh.ORIG' saved." + msg_ok="Symlink '${LXC_CONTAINER_DIR}/rootfs/bin/sh.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1097,7 +1245,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Saving Symlink '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/bin/sh' failed!" + msg_failed="Saving Symlink '${LXC_CONTAINER_DIR}/rootfs/etc/bin/sh' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1118,10 +1266,10 @@ fi msg="Create new Symlink '/bin/sh' pointing to 'bash' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -ln -s bash ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/bin/sh > $err_msg 2>&1 +ln -s bash ${LXC_CONTAINER_DIR}/rootfs/bin/sh > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="New Symlink '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/bin/sh' created." + msg_ok="New Symlink '${LXC_CONTAINER_DIR}/rootfs/bin/sh' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1134,7 +1282,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Creation of new Symlink '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/bin/sh' failed!" + msg_failed="Creation of new Symlink '${LXC_CONTAINER_DIR}/rootfs/etc/bin/sh' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1153,13 +1301,13 @@ fi # - Add entry for hostname in /etc/hosts # - echo "" -msg="Add entry for hostname '$FQ_HOSTNAME' to file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hosts' .." +msg="Add entry for hostname '$FQ_HOSTNAME' to file '${LXC_CONTAINER_DIR}/rootfs/etc/hosts' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -perl -i.ORIG -n -p -e "s/^(\s*127\.0\.0\.1.*)/\1\n127.0.1.1 $FQ_HOSTNAME $HOSTNAME\n/" ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hosts > $err_msg 2>&1 +perl -i.ORIG -n -p -e "s/^(\s*127\.0\.0\.1.*)/\1\n127.0.1.1 $FQ_HOSTNAME $HOSTNAME\n/" ${LXC_CONTAINER_DIR}/rootfs/etc/hosts > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="Entry '127.0.1.1 $FQ_HOSTNAME $HOSTNAME' added to '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hosts'." + msg_ok="Entry '127.0.1.1 $FQ_HOSTNAME $HOSTNAME' added to '${LXC_CONTAINER_DIR}/rootfs/etc/hosts'." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1172,7 +1320,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Adding entry '127.0.1.1 $FQ_HOSTNAME $HOSTNAME' to '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hosts' failed!" + msg_failed="Adding entry '127.0.1.1 $FQ_HOSTNAME $HOSTNAME' to '${LXC_CONTAINER_DIR}/rootfs/etc/hosts' failed!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1191,13 +1339,13 @@ fi # - Backup Containers file '/etc/hostname' # - echo "" -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname' .." +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs/etc/hostname' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname.ORIG" > $err_msg 2>&1 +mv "${LXC_CONTAINER_DIR}/rootfs/etc/hostname" "${LXC_CONTAINER_DIR}/rootfs/etc/hostname.ORIG" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/etc/hostname.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1210,7 +1358,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/rootfs/etc/hostname'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1228,13 +1376,13 @@ fi # - Write new Containers file /etc/hostname # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/etc/hostname' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -echo "$HOSTNAME" > "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname" 2>$err_msg +echo "$HOSTNAME" > "${LXC_CONTAINER_DIR}/rootfs/etc/hostname" 2>$err_msg if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/etc/hostname' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1247,7 +1395,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/hostname'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/etc/hostname'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1271,7 +1419,7 @@ _pkg="figlet" msg="Install '$_pkg' from debian package system .." if ! $(aptitude search "$_pkg" | grep " $_pkg " | grep -e "^i" > /dev/null 2>&1) ; then - DEBIAN_FRONTEND=noninteractive apt-get -y install $needed_packages_base > /dev/null 2> "$err_msg" + DEBIAN_FRONTEND=noninteractive apt-get -y install $_pkg > /dev/null 2> "$err_msg" if [[ $? -eq 0 ]] ; then msg_ok="Debian package '$_pkg' successfully installed." @@ -1309,13 +1457,13 @@ fi # - Backup Containers file '/etc/motd' # - echo "" -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd' .." +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs/etc/motd' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd.ORIG" > $err_msg 2>&1 +mv "${LXC_CONTAINER_DIR}/rootfs/etc/motd" "${LXC_CONTAINER_DIR}/rootfs/etc/motd.ORIG" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/etc/motd.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1328,7 +1476,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/rootfs/etc/motd'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1346,13 +1494,13 @@ fi # - Create new containers file '/etc/motd' # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/etc/motd' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -figlet $HOSTNAME > "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd" +figlet $HOSTNAME > "${LXC_CONTAINER_DIR}/rootfs/etc/motd" if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/etc/motd' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1365,7 +1513,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/motd'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/etc/motd'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1385,13 +1533,13 @@ fi # - Backup Containers file '/etc/ssh/sshd_config' # - echo "" -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config' .." +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config.ORIG" > $err_msg 2>&1 +mv "${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config" "${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config.ORIG" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1404,7 +1552,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1422,15 +1570,15 @@ fi # - Create new containers file '/etc/ssh/sshd_config' # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" if [[ -f "${working_dir}/supported-files/sshd_config" ]]; then cp -a "${working_dir}/supported-files/sshd_config" \ - "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config" 2>$err_msg + "${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config" 2>$err_msg if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1443,7 +1591,7 @@ if [[ -f "${working_dir}/supported-files/sshd_config" ]]; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/etc/ssh/sshd_config'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/etc/ssh/sshd_config'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1465,13 +1613,13 @@ fi # - Backup Containers file '/root/.bashrc' # - echo "" -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs//root/.bashrc' .." +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs//root/.bashrc' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc.ORIG" > $err_msg 2>&1 +mv "${LXC_CONTAINER_DIR}/rootfs/root/.bashrc" "${LXC_CONTAINER_DIR}/rootfs/root/.bashrc.ORIG" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/root/.bashrc.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1484,7 +1632,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/rootfs/root/.bashrc'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1502,15 +1650,15 @@ fi # - Create new containers file '/root/.bashrc' # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/root/.bashrc' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" if [[ -f "${working_dir}/supported-files/templates_root/.bashrc" ]]; then cp -a "${working_dir}/supported-files/templates_root/.bashrc" \ - "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc" 2>$err_msg + "${LXC_CONTAINER_DIR}/rootfs/root/.bashrc" 2>$err_msg if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/root/.bashrc' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1523,7 +1671,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.bashrc" ]]; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.bashrc'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/root/.bashrc'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1544,13 +1692,13 @@ fi # - Backup Containers file '/root/.profile' # - -msg="Backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs//root/.profile' .." +msg="Backup file '${LXC_CONTAINER_DIR}/rootfs//root/.profile' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" -mv "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile" "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile.ORIG" > $err_msg 2>&1 +mv "${LXC_CONTAINER_DIR}/rootfs/root/.profile" "${LXC_CONTAINER_DIR}/rootfs/root/.profile.ORIG" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="File '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile.ORIG' saved." + msg_ok="File '${LXC_CONTAINER_DIR}/rootfs/root/.profile.ORIG' saved." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1563,7 +1711,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Could not backup file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile'!" + msg_failed="Could not backup file '${LXC_CONTAINER_DIR}/rootfs/root/.profile'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1581,15 +1729,15 @@ fi # - Create new containers file '/root/.profile' # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/root/.profile' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" if [[ -f "${working_dir}/supported-files/templates_root/.profile" ]]; then cp -a "${working_dir}/supported-files/templates_root/.profile" \ - "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile" 2>$err_msg + "${LXC_CONTAINER_DIR}/rootfs/root/.profile" 2>$err_msg if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/root/.profile' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1602,7 +1750,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.profile" ]]; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.profile'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/root/.profile'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1623,15 +1771,15 @@ fi # - Create new containers file '/root/.vimrc' # - -msg="Create a new file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.vimrc' .." +msg="Create a new file '${LXC_CONTAINER_DIR}/rootfs/root/.vimrc' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" if [[ -f "${working_dir}/supported-files/templates_root/.vimrc" ]]; then cp -a "${working_dir}/supported-files/templates_root/.vimrc" \ - "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.vimrc" 2>$err_msg + "${LXC_CONTAINER_DIR}/rootfs/root/.vimrc" 2>$err_msg if [[ $? -eq 0 ]] ; then - msg_ok="New file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.vimrc' created." + msg_ok="New file '${LXC_CONTAINER_DIR}/rootfs/root/.vimrc' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1644,7 +1792,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.vimrc" ]]; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create file '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.vimrc'!" + msg_failed="Failed to create file '${LXC_CONTAINER_DIR}/rootfs/root/.vimrc'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1667,11 +1815,11 @@ fi # - Create new container directory '/root/bin' # - echo "" -msg="Create a new directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin' .." +msg="Create a new directory '${LXC_CONTAINER_DIR}/rootfs/root/bin' .." -mkdir "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin" > $err_msg 2>&1 +mkdir "${LXC_CONTAINER_DIR}/rootfs/root/bin" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="New directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin' created." + msg_ok="New directory '${LXC_CONTAINER_DIR}/rootfs/root/bin' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1684,7 +1832,7 @@ if [[ $? -eq 0 ]] ; then fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to create directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin'!" + msg_failed="Failed to create directory '${LXC_CONTAINER_DIR}/rootfs/root/bin'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1702,11 +1850,11 @@ fi # - Add git repository 'admin-stuff' # - -msg="Clone git repository 'admin-stuff' to '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin/admin-stuff'" -git clone https://git.oopen.de/script/admin-stuff ${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin/admin-stuff 2> /dev/null +msg="Clone git repository 'admin-stuff' to '${LXC_CONTAINER_DIR}/rootfs/root/bin/admin-stuff'" +git clone https://git.oopen.de/script/admin-stuff ${LXC_CONTAINER_DIR}/rootfs/root/bin/admin-stuff 2> /dev/null if [[ $? -eq 0 ]] ; then - msg_ok="Git repository '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/bin/admin-stuff' created." + msg_ok="Git repository '${LXC_CONTAINER_DIR}/rootfs/root/bin/admin-stuff' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1738,16 +1886,16 @@ fi # - Create new containers directory '/root/.ssh' # - echo "" -msg="Create a new directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh' .." +msg="Create a new directory '${LXC_CONTAINER_DIR}/rootfs/root/.ssh' .." echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" if [[ -f "${working_dir}/supported-files/templates_root/.ssh/authorized_keys2" ]] || [[ -f "${working_dir}/supported-files/templates_root/.ssh/authorized_keys" ]]; then - mkdir "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh" > $err_msg 2>&1 + mkdir "${LXC_CONTAINER_DIR}/rootfs/root/.ssh" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="New directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh' created." + msg_ok="New directory '${LXC_CONTAINER_DIR}/rootfs/root/.ssh' created." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1760,12 +1908,12 @@ if [[ -f "${working_dir}/supported-files/templates_root/.ssh/authorized_keys2" ] fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" - msg="Copy supported files to '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh/' .." + msg="Copy supported files to '${LXC_CONTAINER_DIR}/rootfs/root/.ssh/' .." cp -a "${working_dir}/supported-files/templates_root/.ssh" \ - "${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/" > $err_msg 2>&1 + "${LXC_CONTAINER_DIR}/rootfs/root/" > $err_msg 2>&1 if [[ $? -eq 0 ]] ; then - msg_ok="Supported files copied to new directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh'." + msg_ok="Supported files copied to new directory '${LXC_CONTAINER_DIR}/rootfs/root/.ssh'." length_msg_ok=${#msg_ok} blank_signs="" if [[ $length_msg -gt $length_msg_ok ]]; then @@ -1778,7 +1926,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.ssh/authorized_keys2" ] fi echo -e "\033[1G [ \033[32m\033[1mok\033[m ] ${msg_ok}${blank_signs}" else - msg_failed="Failed to copy supported files to '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh'!" + msg_failed="Failed to copy supported files to '${LXC_CONTAINER_DIR}/rootfs/root/.ssh'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1794,7 +1942,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.ssh/authorized_keys2" ] fi else - msg_failed="Failed to create directory '${LXC_ROOT_DIR}/${LXC_NAME}/rootfs/root/.ssh'!" + msg_failed="Failed to create directory '${LXC_CONTAINER_DIR}/rootfs/root/.ssh'!" length_msg_failed=${#msg_failed} blank_signs="" if [[ $length_msg -gt $length_msg_failed ]]; then @@ -1867,7 +2015,8 @@ echo -en "\033[1G \033[1;30m[ ... ] \033[32m$msg\033[m" _failed=false cat << EOF > ${working_dir}/conf/${LXC_NAME}.conf 2> $err_msg -LXC_ROOT_DIR=$LXC_ROOT_DIR= +LXC_ROOT_DIR=$LXC_ROOT_DIR +LXC_CONTAINER_DIR=$LXC_CONTAINER_DIR LXC_NAME=$LXC_NAME