Fix console config and domain argument
This commit is contained in:
parent
0019881cfa
commit
62d5ff11df
|
@ -35,12 +35,11 @@
|
||||||
# hostname with no domain set.
|
# hostname with no domain set.
|
||||||
#
|
#
|
||||||
# The resulting pfSense instance will use the default "root"/"pfsense" credentials and
|
# The resulting pfSense instance will use the default "root"/"pfsense" credentials and
|
||||||
# will support both serial and VNC interfaces; note that if both are added, login will only
|
# will support both serial and VNC interfaces; boot messages will only show on serial.
|
||||||
# work over the VNC interface due to limitations of the pfSense configuration. SLAAC IPv6
|
# SLAAC will be used for IPv6 on WAN in addition to the specified IPv4 configuration.
|
||||||
# will be used for the WAN in addition to the specified IPv4 configuration methods. A set
|
# A set of default-permit rules on the WAN interface are included to allow management on the
|
||||||
# of default-permit rules on the WAN interface are included to allow management on the WAN
|
# WAN side, and these should be modified or removed once the system is configured.
|
||||||
# side, and these should be modified or removed once the system is configured. Finally, the
|
# Finally, the Web Configurator is set to use HTTP only.
|
||||||
# Web Configurator is set to use HTTP only.
|
|
||||||
#
|
#
|
||||||
# Other than the above specified values, the new pfSense instance will be completely
|
# Other than the above specified values, the new pfSense instance will be completely
|
||||||
# unconfigured and must then be adjusted as needed via the Web Configurator ASAP to ensure
|
# unconfigured and must then be adjusted as needed via the Web Configurator ASAP to ensure
|
||||||
|
@ -455,7 +454,7 @@ class VMBuilderScript(VMBuilder):
|
||||||
"<wait1>",
|
"<wait1>",
|
||||||
"echo 'comconsole_speed=\"115200\"' >> /mnt/boot/loader.conf<enter>",
|
"echo 'comconsole_speed=\"115200\"' >> /mnt/boot/loader.conf<enter>",
|
||||||
"<wait1>",
|
"<wait1>",
|
||||||
"sed -i.bak '/^ttyu/s/off/onifconsole/' /mnt/etc/ttys<enter>",
|
"sed -i.bak '/^ttyu/s/off/on/' /mnt/etc/ttys<enter>",
|
||||||
"<wait1>",
|
"<wait1>",
|
||||||
# Grab template configuration from provisioner
|
# Grab template configuration from provisioner
|
||||||
# We have to do DHCP first, then do the telnet fetch inside a chroot
|
# We have to do DHCP first, then do the telnet fetch inside a chroot
|
||||||
|
@ -487,7 +486,9 @@ class VMBuilderScript(VMBuilder):
|
||||||
# Set the hostname and domain if vm_fqdn is set
|
# Set the hostname and domain if vm_fqdn is set
|
||||||
if self.vm_data["script_arguments"].get("vm_fqdn") is not None:
|
if self.vm_data["script_arguments"].get("vm_fqdn") is not None:
|
||||||
pfsense_hostname = self.vm_data["script_arguments"]["vm_fqdn"].split(".")[0]
|
pfsense_hostname = self.vm_data["script_arguments"]["vm_fqdn"].split(".")[0]
|
||||||
pfsense_domain = self.vm_data["script_arguments"]["vm_fqdn"].split(".")[1:]
|
pfsense_domain = ".".join(
|
||||||
|
self.vm_data["script_arguments"]["vm_fqdn"].split(".")[1:]
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
pfsense_hostname = self.vm_name
|
pfsense_hostname = self.vm_name
|
||||||
pfsense_domain = ""
|
pfsense_domain = ""
|
||||||
|
|
Loading…
Reference in New Issue