3 files changed, 21 insertions, 3 deletions

diff --git a/sys/dev/usb/template/usb_template_modem.c b/sys/dev/usb/template/usb_template_modem.c
index 9f80578c437bd..66229e736ab6d 100644
--- a/sys/dev/usb/template/usb_template_modem.c
+++ b/sys/dev/usb/template/usb_template_modem.c
@@ -81,7 +81,13 @@ enum {
 #define	MODEM_DEFAULT_INTERFACE		"Virtual serial port"
 #define	MODEM_DEFAULT_MANUFACTURER	USB_TEMPLATE_MANUFACTURER
 #define	MODEM_DEFAULT_PRODUCT		"Virtual serial port"
-#define	MODEM_DEFAULT_SERIAL_NUMBER	"March 2008"
+/*
+ * The reason for this being called like this is that OSX
+ * derives the device node name from it, resulting in a somewhat
+ * user-friendly "/dev/cu.usbmodemFreeBSD1".  And yes, the "1"
+ * needs to be there, otherwise OSX will mangle it.
+ */
+#define	MODEM_DEFAULT_SERIAL_NUMBER	"FreeBSD1"
 
 static struct usb_string_descriptor	modem_interface;
 static struct usb_string_descriptor	modem_manufacturer;
diff --git a/sys/dev/usb/template/usb_template_multi.c b/sys/dev/usb/template/usb_template_multi.c
index 25365a51337df..7f32268734758 100644
--- a/sys/dev/usb/template/usb_template_multi.c
+++ b/sys/dev/usb/template/usb_template_multi.c
@@ -99,7 +99,13 @@ enum {
 #define	MULTI_DEFAULT_CONFIGURATION	"Default configuration"
 #define	MULTI_DEFAULT_MANUFACTURER	USB_TEMPLATE_MANUFACTURER
 #define	MULTI_DEFAULT_PRODUCT		"Multifunction Device"
-#define	MULTI_DEFAULT_SERIAL_NUMBER	"May 2018"
+/*
+ * The reason for this being called like this is that OSX
+ * derives the device node name from it, resulting in a somewhat
+ * user-friendly "/dev/cu.usbmodemFreeBSD1".  And yes, the "1"
+ * needs to be there, otherwise OSX will mangle it.
+ */
+#define MULTI_DEFAULT_SERIAL_NUMBER	"FreeBSD1"
 
 static struct usb_string_descriptor	multi_modem;
 static struct usb_string_descriptor	multi_eth_mac;
diff --git a/sys/dev/usb/template/usb_template_serialnet.c b/sys/dev/usb/template/usb_template_serialnet.c
index 2eb722b5f4fd7..afc6ab493fb6f 100644
--- a/sys/dev/usb/template/usb_template_serialnet.c
+++ b/sys/dev/usb/template/usb_template_serialnet.c
@@ -97,7 +97,13 @@ enum {
 #define	SERIALNET_DEFAULT_CONFIGURATION	"Default configuration"
 #define	SERIALNET_DEFAULT_MANUFACTURER	USB_TEMPLATE_MANUFACTURER
 #define	SERIALNET_DEFAULT_PRODUCT	"Serial/Ethernet device"
-#define	SERIALNET_DEFAULT_SERIAL_NUMBER	"January 2015"
+/*
+ * The reason for this being called like this is that OSX
+ * derives the device node name from it, resulting in a somewhat
+ * user-friendly "/dev/cu.usbmodemFreeBSD1".  And yes, the "1"
+ * needs to be there, otherwise OSX will mangle it.
+ */
+#define SERIALNET_DEFAULT_SERIAL_NUMBER	"FreeBSD1"
 
 static struct usb_string_descriptor	serialnet_modem;
 static struct usb_string_descriptor	serialnet_eth_mac;