Projet

Général

Profil

« Précédent | Suivant » 

Révision 814df256

Ajouté par Renato Botelho il y a presque 10 ans

Set default serial speed to 115200 for 2.2, fixes #3715

Voir les différences:

builder_scripts/builder_common.sh
1191 1191
		mkdir -p $MAKEOBJDIRPREFIX
1192 1192
	fi
1193 1193

  
1194
	# Set default serial speed
1195
	if [ ${FREEBSD_VERSION} -ge 10 ]; then
1196
		export MAKE_CONF="${MAKE_CONF} BOOT_COMCONSOLE_SPEED=115200"
1197
	fi
1198

  
1194 1199
	# Check if the world and kernel are already built and set
1195 1200
	# the NO variables accordingly
1196 1201
	if [ -d "${MAKEOBJDIRPREFIX}" ]; then
......
2848 2853
	echo ">>>   Activating serial console..." 2>&1 | tee -a ${LOGFILE}
2849 2854
	# Activate serial console in boot.config
2850 2855
	if [ -f ${BOOTCONF} ]; then
2851
		sed -i "" '/^-D$/d' ${BOOTCONF}
2856
		sed -i "" '/-D$/d' ${BOOTCONF}
2857
	fi
2858
	if [ ${FREEBSD_VERSION} -ge 10 ]; then
2859
		echo -n "-S115200 " >> ${BOOTCONF}
2852 2860
	fi
2853 2861
	echo "-D" >> ${BOOTCONF}
2854 2862

  
......
2866 2874
	echo 'boot_multicons="YES"' >>  ${LOADERCONF}
2867 2875
	echo 'boot_serial="YES"' >> ${LOADERCONF}
2868 2876
	echo 'console="comconsole,vidconsole"' >> ${LOADERCONF}
2877
	if [ ${FREEBSD_VERSION} -ge 10 ]; then
2878
		echo 'comconsole_speed="115200"' >> ${LOADERCONF}
2879
	fi
2869 2880

  
2870 2881
	# Activate serial console TTY
2871 2882
	sed -i "" -Ee "s/^ttyu0.*$/ttyu0	\"\/usr\/libexec\/getty bootupcli\"	cons25	on	secure/" ${TTYS}
builder_scripts/conf/kernel/pfSense_SMP.10
237 237
device          nvme
238 238
#device		sfxge		# Cannot be compiled in kernel!!!
239 239

  
240
# Default serial speed
241
options		CONSPEED=115200
builder_scripts/conf/kernel/pfSense_wrap.10.i386
257 257
device          nvme
258 258
#device          sfxge
259 259

  
260
# Default serial speed
261
options		CONSPEED=115200
builder_scripts/conf/kernel/pfSense_wrap_vga.10.i386
244 244
device		nve		# nVidia nForce MCP on-board Ethernet Networking
245 245
device          nvme
246 246
#device          sfxge
247

  
248
# Default serial speed
249
options		CONSPEED=115200

Formats disponibles : Unified diff