diff options
| -rw-r--r-- | ChangeLog.md | 5 | ||||
| -rwxr-xr-x | kvmx | 17 | ||||
| -rw-r--r-- | kvmxfile | 10 |
3 files changed, 20 insertions, 12 deletions
diff --git a/ChangeLog.md b/ChangeLog.md index e7e4283..d2062bd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,10 @@ # ChangeLog +## 0.1.1 - unreleased + +* Provide default parameters by loading the sample config. + This allows a `kvmxfile` to be small and have only the overrides. + ## 0.1.0 - 2024-05-17 * This software started on 2017-03-09, but only now it's getting an initial @@ -19,7 +19,7 @@ # # Basic parameters -VERSION="0.1.0" +VERSION="0.1.1" BASENAME="`basename $0`" DIRNAME="`dirname $0`" ACTION="$1" @@ -122,17 +122,20 @@ function __kvmx_initialize { GUEST_DISPLAY="$(((RANDOM % 10) + 1))" XDMCP_PORT="$(($RANDOM + 10000))" + # Load the default config, providing defaults + source $APP_BASE/kvmxfile || exit 1 + + # Set hostname (this is already done with the default config) + #hostname="${hostname:-$VM}" + + # Set domain (this is already done with the default config) + #domain="${domain:-example.org}" + # Load user config if [ -e "$GLOBAL_USER_CONFIG_FILE" ]; then source $GLOBAL_USER_CONFIG_FILE fi - # Set hostname - hostname="${hostname:-$VM}" - - # Set domain - domain="${domain:-example.org}" - # Load and check guest config if [ "$ACTION" != "ls" ] && [ "$ACTION" != "edit" ] && [ "$ACTION" != "usage" ]; then if [ ! -e "$GLOBAL_USER_CONFIG_FOLDER/$VM" ]; then @@ -30,8 +30,8 @@ net="user" # Set this is you want to be able to share a single folder between host and guest. # Needs ssh_support set to "y" and a workable SSH connection to the guest. -shared_folder="." -shared_folder_mountpoint="/home/$user/code/$VM" +#shared_folder="." +#shared_folder_mountpoint="/home/$user/code/$VM" #shared_folder="$HOME/temp/shared/$VM" #shared_folder_mountpoint="/home/$user/temp/shared/$VM" #shared_folder_mountpoint="/srv/shared" @@ -105,10 +105,10 @@ graphics="-vga qxl" vnc_client="virt-viewer" # SPICE support -spice="1" +spice="0" # Set this if you want to attach an spice client when the machine boots. -run_spice_client="1" +run_spice_client="0" # SPICE client #spice_client="remote-viewer" @@ -116,7 +116,7 @@ run_spice_client="1" spice_client="spicy" # Set this if you want that kvmx-vdagent is triggered after the machine boots. -kvmx_vdagent="1" +kvmx_vdagent="0" # Set this if you want to start an xpra session when the machine boots. run_xpra="0" |