Merge pull request #53 from dermotbradley/reinstate-previous-ssh-config

The version of openssh server packaged in Alpine releases prior to
dermotbradley · Sep 24, 2023 · 3779349 · 3779349
2 parents bbfb686 + 94b36fa
commit 3779349
Show file tree

Hide file tree

Showing 9 changed files with 414 additions and 125 deletions.
diff --git a/create-alpine-disk-image b/create-alpine-disk-image
@@ -234,7 +234,7 @@ fi
 
 _chroot_cmd="cat <<EOT"
 if [ "$image_output_chroot_script" = "true" ]; then
-  _chroot_script_filename="debug-chroot-$(change_filename_extension "$filename_for_image" "sh")"
+  _chroot_script_filename="$(dirname $filename_for_image)/debug-chroot-$(basename $(change_filename_extension "$filename_for_image" "sh"))"
   _chroot_cmd="$_chroot_cmd | tee ${_chroot_script_filename}"
 fi
 _chroot_cmd="$_chroot_cmd | chroot \$chroot_dir /bin/sh -eu"

diff --git a/definitions/cloud/generic/defines b/definitions/cloud/generic/defines
@@ -14,7 +14,7 @@
 # Supported
 readonly CADI_SUPPORTED_ARCHS="aarch64,x86,x86_64"
 #readonly CADI_SUPPORTED_CLOUD_INIT_DATASOURCES="NoCloud,ConfigDrive,Akamai,AliYun,Azure,Bigstep,Ec2,Exoscale,GCE,Hetzner,IBMCloud,OpenStack,Oracle,RbxCloud,Scaleway,UpCloud,Vultr"
-readonly CADI_SUPPORTED_CLOUD_INIT_DATASOURCES="NoCloud,ConfigDrive,AliYun,Azure,Bigstep,Ec2,Exoscale,GCE,Hetzner,IBMCloud,OpenStack,Oracle,RbxCloud,Scaleway,UpCloud,Vultr"
+readonly CADI_SUPPORTED_CLOUD_INIT_DATASOURCES="NoCloud,ConfigDrive,AliYun,Azure,Bigstep,Ec2,Exoscale,GCE,Hetzner,IBMCloud,OpenStack,Oracle,RbxCloud,Scaleway,UpCloud,Vultr,None"
 readonly CADI_SUPPORTED_CONFIGURATION_TOOLS="cloud-init,none"
 readonly CADI_SUPPORTED_IPV4=true
 readonly CADI_SUPPORTED_IPV6=true

diff --git a/definitions/virtual/generic/defines b/definitions/virtual/generic/defines
@@ -13,7 +13,7 @@
 
 # Supported
 readonly CADI_SUPPORTED_ARCHS="aarch64,x86,x86_64"
-readonly CADI_SUPPORTED_CLOUD_INIT_DATASOURCES="AltCloud,ConfigDrive,LXD,NoCloud,OpenNebula,OpenStack,OVF,VMware"
+readonly CADI_SUPPORTED_CLOUD_INIT_DATASOURCES="AltCloud,ConfigDrive,LXD,NoCloud,OpenNebula,OpenStack,OVF,VMware,None"
 readonly CADI_SUPPORTED_CONFIGURATION_TOOLS="cloud-init,none"
 readonly CADI_SUPPORTED_IPV4=true
 readonly CADI_SUPPORTED_IPV6=true

diff --git a/lib/common-defines b/lib/common-defines
@@ -22,7 +22,7 @@ readonly CADI_RAMDISK_SIZE=3G
 readonly CADI_DEFAULT_ALPINE_RELEASE="edge"
 readonly CADI_GLOBAL_DEFAULT_OS_DEVICE_TYPE="sata"
 readonly CADI_DEFAULT_CHROOT_DIRECTORY="./chroot"
-readonly CADI_DEFAULT_CONSOLE_ONLY_GROUP="local-only"
+readonly CADI_DEFAULT_CONSOLE_ONLY_GROUP="console-only"
 readonly CADI_DEFAULT_CONSOLE_USER_ACCOUNT="localadmin"
 readonly CADI_DEFAULT_IMAGES_DIRECTORY="./alpine-images"
 readonly CADI_DEFAULT_IPV6_TYPE="dhcp"

diff --git a/lib/common-functions b/lib/common-functions
@@ -855,8 +855,8 @@ insert_chroot_function_get_kernel_version() {
   cat <<-EOF >> "$run_script"
 	
 	get_kernel_version() {
-	  echo "\\\$(apk info linux-${_kernel_type} | head -n 1 | sed -e "s/^linux-${_kernel_type}-//" \\
-	    -e 's/-r/-/' -e 's/ .*//' -Ee "s/^(.*)\$/\\1-${_kernel_type}/")"
+	  apk info linux-${_kernel_type} | head -n 1 | sed -e "s/^linux-${_kernel_type}-//" \\
+	    -e 's/-r/-/' -e 's/ .*//' -Ee "s/^(.*)\$/\\1-${_kernel_type}/"
 	}
 	EOF
 }

diff --git a/lib/disk-image-functions b/lib/disk-image-functions
@@ -189,7 +189,7 @@ basic_os_configuration() {
 
   cat <<-EOF >> "$run_script"
 	    write_log "Setting locale to \\\$locale" 2
-	    sed -i -E -e "s/^(export LANG=)C.UTF-8/\1\\\$locale/" \\
+	    sed -i -E -e "s/^(export LANG=)C.UTF-8/\1\\\$locale/" \\\\
 	      /etc/profile.d/\\\${locale_file}
 	EOF
 
@@ -3240,8 +3240,8 @@ insert_chroot_function_get_kernel_package_version() {
   cat <<-EOF >> "$run_script"
 	
 	get_kernel_package_version() {
-	  echo "\\\$(apk info linux-$_kernel_type | head -n 1 | sed -e "s/^linux-$_kernel_type-//" \\
-	    -e 's/ .*//')"
+	  apk info linux-$_kernel_type | head -n 1 | sed -e "s/^linux-$_kernel_type-//" \\
+	    -e 's/ .*//'
 	}
 	EOF
 }