diff options
| -rwxr-xr-x | kvmx | 7 | ||||
| -rwxr-xr-x | kvmx-create | 6 |
2 files changed, 10 insertions, 3 deletions
@@ -79,7 +79,6 @@ function __kvmx_initialize { # Default parameters PORT="$(($RANDOM + 1024))" SSH="$(($PORT + 22))" - SSH_LOGIN="user" # Initalize mkdir -p $GLOBAL_USER_CONFIG_FOLDER @@ -123,6 +122,12 @@ function __kvmx_initialize { SSHKEY="$APP_BASE/share/ssh/insecure_private_key" fi + if [ ! -z "$user" ]; then + SSH_LOGIN="$user" + else + SSH_LOGIN="user" + fi + __kvmx_ssh_command $SSHKEY mkdir -p $STATE_DIR diff --git a/kvmx-create b/kvmx-create index 38405a3..7f9270d 100755 --- a/kvmx-create +++ b/kvmx-create @@ -105,6 +105,8 @@ function kvmx_config { kvmx_user_config mirror http://http.debian.net/debian/ "Debian mirror" kvmx_user_config ssh_support y "Administration using passwordless SSH (y/n)" kvmx_user_config ssh_custom y "Setup a custom SSH keypair (y/n)" + kvmx_user_config user user "Initial user name" + kvmx_user_config password $RANDOM "Initial user password" } # Load config file @@ -240,7 +242,7 @@ function kvmx_create_custom { echo 'root:root' | kvmx_sudo_run chroot $WORK/ chpasswd # Initial user - kvmx_sudo_run chroot $WORK/ useradd user -G sudo -s /bin/bash + kvmx_sudo_run chroot $WORK/ useradd $user -G sudo -s /bin/bash if [ "$ssh_support" == "y" ]; if [ "$ssh_custom" == "y" ]; then @@ -259,7 +261,7 @@ function kvmx_create_custom { fi kvmx_sudo_run chroot $WORK/ chown -R user.user /home/user - echo 'user:user' | kvmx_sudo_run chroot $WORK/ chpasswd + echo "$user:$password" | kvmx_sudo_run chroot $WORK/ chpasswd # Networking cat <<-EOF | $SUDO tee $WORK/etc/network/interfaces.d/ens3 > /dev/null |