Merge pull request #41 from trueos/kernelupdates

Kernelupdates

README.md

@@ -31,6 +31,8 @@ Only **one** of these arguments may be used at a time.
 - **-change-train TRAIN_NAME**
    - Reconfigure the package repository files to point to the designated TRAIN_NAME.
    - ***WARNING*** This will remove *all* package repository configuration files on the system and create a single "/etc/pkg/Train.conf" file containing the configuration for the desired package train.
+- **-stage2**
+   - Start 2nd stage of update, internal usage only
 
 ## Secondary/Optional Arguments
 There are a number of secondary/optional flags that can be used for additional functionality:

defines/defines.go

@@ -16,29 +16,35 @@ var WSClient *websocket.Conn
 var pkgflags string
 
 // What is this tool called?
-var toolname = "sysup"
+var ToolName = "sysup"
 
 // Where to log by default
-var LogFile = "/var/log/" + toolname + ".log"
+var LogFile = "/var/log/" + ToolName + ".log"
 
 // Configuration file location
-var ConfigJson = "/usr/local/etc/" + toolname + ".json"
+var ConfigJson = "/usr/local/etc/" + ToolName + ".json"
 
 // Global trains URL
 var TrainsUrl string
 
+// Default kernel pkg name
+var KernelPkg string
+
+// Are we running without WS backend
+var DisableWSMsg = false
+
 // Set our default bootstrap options
 var Bootstrap = false
 var BootstrapFatal = false
 
 // Default pubkey used for trains
-var TrainPubKey = "/usr/local/share/" + toolname + "/trains.pub"
+var TrainPubKey = "/usr/local/share/" + ToolName + "/trains.pub"
 
 // Package defaults
 //----------------------------------------------------
 var PKGBIN = "pkg-static"
 
-var SysUpDb = "/var/db/" + toolname
+var SysUpDb = "/var/db/" + ToolName
 var PkgDb = SysUpDb + "/pkgdb"
 var ImgMnt = SysUpDb + "/mnt"
 var PkgConf = SysUpDb + "/pkg.conf"
@@ -76,6 +82,7 @@ var CheckFlag bool
 var DisableBsFlag bool
 var FullUpdateFlag bool
 var ListTrainFlag bool
+var Stage2Flag bool
 var UpdateFlag bool
 var UpdateFileFlag string
 var UpdateKeyFlag string
@@ -143,6 +150,12 @@ func init() {
 		"Use the specified update pubkey for offline updates"+
 			" (Defaults to none)",
 	)
+	flag.BoolVar(
+		&Stage2Flag,
+		"stage2",
+		false,
+		"Start 2nd stage of updating, normally only run internally by sysup",
+	)
 	flag.StringVar(
 		&BeNameFlag,
 		"bename",

main.go

@@ -183,6 +183,12 @@ func main() {
 	// Update any variable locations
 	defines.SetLocs()
 
+	// Bypass normal startup and go straight to updating
+	if defines.Stage2Flag {
+		update.StartStage2()
+		os.Exit(0)
+	}
+
 	// Capture any sigint
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)