Merge pull request rancher#2595 from Jason-ZW/add-4glte-support

Add 4glte support

Author: niusmallnan

Makefile

@@ -60,6 +60,11 @@ hyperv: .dapper
 	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.85-rancher-1" \
 	./.dapper release-hyperv 2>&1 | tee dist/release.log
 
+4glte: .dapper
+	mkdir -p dist
+	APPEND_SYSTEM_IMAGES="rancher/os-modemmanager:v1.6.4-1" \
+	./.dapper release-4glte 2>&1 | tee dist/release.log
+
 help:
 	@./scripts/help
 

cmd/control/udevsettle.go

@@ -1,20 +1,61 @@
 package control
 
 import (
+	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
 
+	"github.com/rancher/os/config"
 	"github.com/rancher/os/pkg/log"
 
 	"github.com/codegangsta/cli"
 )
 
 func udevSettleAction(c *cli.Context) {
+	if err := extraRules(); err != nil {
+		log.Error(err)
+	}
+
 	if err := UdevSettle(); err != nil {
 		log.Fatal(err)
 	}
 }
 
+func extraRules() error {
+	cfg := config.LoadConfig()
+	if len(cfg.Rancher.Network.ModemNetworks) > 0 {
+		rules, err := ioutil.ReadDir(config.UdevRulesExtrasDir)
+		if err != nil {
+			return err
+		}
+		for _, r := range rules {
+			if r.IsDir() || filepath.Ext(r.Name()) != ".rules" {
+				continue
+			}
+			err := os.Symlink(filepath.Join(config.UdevRulesExtrasDir, r.Name()), filepath.Join(config.UdevRulesDir, r.Name()))
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		rules, err := ioutil.ReadDir(config.UdevRulesDir)
+		if err != nil {
+			return err
+		}
+		for _, r := range rules {
+			if r.IsDir() || (filepath.Ext(r.Name()) != ".rules") || (r.Mode()&os.ModeSymlink != 0) {
+				continue
+			}
+			err := os.Remove(filepath.Join(config.UdevRulesDir, r.Name()))
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func UdevSettle() error {
 	cmd := exec.Command("udevd", "--daemon")
 	defer exec.Command("killall", "udevd").Run()

cmd/init/init.go

@@ -58,7 +58,6 @@ func RunInit() error {
 		{"mount OEM2", fsmount.MountOem},
 		{"mount BOOT", fsmount.MountBoot},
 		{"write cfg and log files", configfiles.WriteConfigFiles},
-		{"hypervisor Env", hypervisor.Env},
 		{"b2d Env", b2d.Env},
 		{"hypervisor tools", hypervisor.Tools},
 		{"preparefs2", prepare.FS},

config/schema.go

@@ -88,7 +88,8 @@ var schema = `{
 				"http_proxy": {"type": "string"},
 				"https_proxy": {"type": "string"},
 				"no_proxy": {"type": "string"},
-				"wifi_networks": {"type": "object"}
+				"wifi_networks": {"type": "object"},
+				"modem_networks": {"type": "object"}
 			}
 		},
 

config/types.go

@@ -53,6 +53,8 @@ const (
 	DHCPCDTemplateFile     = "/etc/dhcpcd.conf.tpl"
 	MultiDockerConfFile    = "/var/lib/rancher/conf.d/m-user-docker.yml"
 	MultiDockerDataDir     = "/var/lib/m-user-docker"
+	UdevRulesDir           = "/etc/udev/rules.d"
+	UdevRulesExtrasDir     = "/lib/udev/rules-extras.d"
 )
 
 var (

images/01-base/usr/lib/udev/rules-extras.d/50-firmware.rules

@@ -0,0 +1,3 @@
+# stub for immediately telling the kernel that userspace firmware loading
+# failed; necessary to avoid long timeouts with CONFIG_FW_LOADER_USER_HELPER=y
+SUBSYSTEM=="firmware", ACTION=="add", ATTR{loading}="-1"

images/01-base/usr/lib/udev/rules-extras.d/70-uaccess.rules

@@ -0,0 +1,78 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+ACTION=="remove", GOTO="uaccess_end"
+ENV{MAJOR}=="", GOTO="uaccess_end"
+
+# PTP/MTP protocol devices, cameras, portable media players
+SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="uaccess"
+
+# Digicams with proprietary protocol
+ENV{ID_GPHOTO2}=="?*", TAG+="uaccess"
+
+# SCSI and USB scanners
+ENV{libsane_matched}=="yes", TAG+="uaccess"
+
+# HPLIP devices (necessary for ink level check and HP tool maintenance)
+ENV{ID_HPLIP}=="1", TAG+="uaccess"
+
+# optical drives
+SUBSYSTEM=="block", ENV{ID_CDROM}=="1", TAG+="uaccess"
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", TAG+="uaccess"
+
+# Sound devices
+SUBSYSTEM=="sound", TAG+="uaccess" \
+  OPTIONS+="static_node=snd/timer", OPTIONS+="static_node=snd/seq"
+
+# ffado is an userspace driver for firewire sound cards
+SUBSYSTEM=="firewire", ENV{ID_FFADO}=="1", TAG+="uaccess"
+
+# Webcams, frame grabber, TV cards
+SUBSYSTEM=="video4linux", TAG+="uaccess"
+SUBSYSTEM=="dvb", TAG+="uaccess"
+
+# IIDC devices: industrial cameras and some webcams
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*",  TAG+="uaccess"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*",  TAG+="uaccess"
+# AV/C devices: camcorders, set-top boxes, TV sets, audio devices, and more
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", TAG+="uaccess"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", TAG+="uaccess"
+
+# DRI video devices
+SUBSYSTEM=="drm", KERNEL=="card*|renderD*", TAG+="uaccess"
+
+# KVM
+SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="uaccess"
+
+# smart-card readers
+ENV{ID_SMARTCARD_READER}=="?*", TAG+="uaccess"
+
+# (USB) authentication devices
+ENV{ID_SECURITY_TOKEN}=="?*", TAG+="uaccess"
+
+# PDA devices
+ENV{ID_PDA}=="?*", TAG+="uaccess"
+
+# Programmable remote control
+ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess"
+
+# joysticks
+SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="uaccess"
+
+# color measurement devices
+ENV{COLOR_MEASUREMENT_DEVICE}=="?*", TAG+="uaccess"
+
+# DDC/CI device, usually high-end monitors such as the DreamColor
+ENV{DDC_DEVICE}=="?*", TAG+="uaccess"
+
+# media player raw devices (for user-mode drivers, Android SDK, etc.)
+SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="uaccess"
+
+# software-defined radio communication devices
+ENV{ID_SOFTWARE_RADIO}=="?*", TAG+="uaccess"
+
+LABEL="uaccess_end"

images/01-base/usr/lib/udev/rules-extras.d/73-special-net-names.rules

@@ -0,0 +1,9 @@
+# On Dell PowerEdge systems, the iDRAC7 and later support a USB Virtual NIC
+#   which terminates in the iDRAC. Help identify this with 'idrac'
+ACTION=="add", SUBSYSTEM=="net", SUBSYSTEMS=="usb", ATTRS{idVendor}=="413c", ATTRS{idProduct}=="a102", NAME="idrac"
+
+# ibmveth devices' $DEVPATH number is tied to (virtual) hardware (slot id
+# selected in the HMC), thus this provides a reliable naming (e. g.
+# "/devices/vio/30000002/net/eth1"); we ignore the bus number, as
+# there should only ever be one bus, and then remove leading zeros
+ACTION=="add", SUBSYSTEM=="net", NAME=="", DRIVERS=="ibmveth", PROGRAM="/bin/sh -ec 'D=${DEVPATH#*/vio/}; D=${D%%%%/*}; D=${D#????}; D=${D#0}; D=${D#0}; D=${D#0}; D=${D#0}; echo ${D:-0}'", NAME="ibmveth$result"

images/01-base/usr/lib/udev/rules-extras.d/73-usb-net-by-mac.rules

@@ -0,0 +1,14 @@
+# Use MAC based names for network interfaces which are directly or indirectly
+# on USB and have an universally administered (stable) MAC address (second bit
+# is 0). Don't do this when ifnames is disabled via kernel command line or
+# customizing/disabling 80-net-setup-link.rules.
+
+IMPORT{cmdline}="net.ifnames"
+ENV{net.ifnames}=="0", GOTO="usb_net_by_mac_end"
+
+ACTION=="add", SUBSYSTEM=="net", SUBSYSTEMS=="usb", NAME=="", \
+    ATTR{address}=="?[014589cd]:*", \
+    TEST!="/etc/udev/rules.d/80-net-setup-link.rules", \
+    IMPORT{builtin}="net_id", NAME="$env{ID_NET_NAME_MAC}"
+
+LABEL="usb_net_by_mac_end"

images/01-base/usr/lib/udev/rules-extras.d/77-mm-cinterion-port-types.rules

@@ -0,0 +1,11 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add|change|move", GOTO="mm_cinterion_port_types_end"
+SUBSYSTEM!="tty", GOTO="mm_cinterion_port_types_end"
+ENV{ID_VENDOR_ID}!="1e2d", GOTO="mm_cinterion_port_types_end"
+
+SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}"
+
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0053", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_CINTERION_PORT_TYPE_GPS}="1"
+
+LABEL="mm_cinterion_port_types_end"