diff --git a/lib/functions.sh b/lib/functions.sh index 23e885d..25b4b61 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -144,7 +144,7 @@ function trap_error() { # local file="${0:-}" local err=$1 # error status local line=$2 # LINENO - local linecallfunc=${3:-} + # local linecallfunc=${3:-} local command="${4:-}" local funcstack="${5:-}" local caller @@ -340,7 +340,7 @@ EOF1 function join() { local IFS="$1" shift - echo "$*" + builtin echo "$*" } # execute remote scripting onto one LXC container [COMMANDS, ...] diff --git a/lib/install.sh b/lib/install.sh index d89e206..e00d7f0 100755 --- a/lib/install.sh +++ b/lib/install.sh @@ -423,12 +423,6 @@ else TARGET=${1:-} CURRENT_USER=$(id -un) - is_email_valid "pvincent" && echo OK || echo NOPE - is_email_valid "pvincent@aa" && echo OK || echo NOPE - is_email_valid "pvincent@artcode." && echo OK || echo NOPE - is_email_valid "pvincent@artcode.re" && echo OK || echo NOPE - exit 1 - sudo_required check_target install_miaou_bash diff --git a/scripts/lxc-miaou-create b/scripts/lxc-miaou-create index 5a8c7ad..d5914dc 100755 --- a/scripts/lxc-miaou-create +++ b/scripts/lxc-miaou-create @@ -57,10 +57,14 @@ function create() { packages=(git file bc bash-completion) [[ "$OPTION_SSH" == true ]] && packages+=(openssh-server) packages_string=$(join ', ' "${packages[@]}") + + timezone='Indian/Reunion' #FIXME: should be retrieved from host + debian_repo='debian.mithril.re' #FIXME: should be retrieved from host + user_data="$( cat < @@ -96,6 +100,7 @@ runcmd: final_message: "Container from datasource \$datasource is finally up, after \$UPTIME seconds" EOF )" + lxc init local:debian/$CONTAINER_RELEASE/cloud "$CONTAINER" --config user.user-data="$user_data" -q # allow directory `SHARED` to be read-write mounted @@ -159,7 +164,7 @@ EOF fi if [[ "$OPTION_SSH" == true && "$OPTION_SAMEUSER" == true ]]; then - lxc-miaou-enable-ssh "$CONTAINER" + lxc-miaou-enable-ssh "$CONTAINER" >/dev/null fi PREFIX="" echoinfo OK