Install binaries even if booting from overlay (#480)

* Install binaries even if u running from overlay

* Store correct list of bins

* Cleanup

Author: Muhamad Azmy

cmds/identityd/main.go

@@ -189,6 +189,23 @@ func main() {
 		}
 	}()
 
+	zinit, err := zinit.New(zinitSocket)
+	if err != nil {
+		log.Fatal().Err(err).Msg("failed to connect to zinit")
+	}
+
+	// with volume allocation is set to nil this flister can be
+	// only used for RO mounts. Otherwise it will panic
+	flister := flist.New(root, nil)
+
+	upgrader := upgrade.Upgrader{
+		FLister:      flister,
+		Zinit:        zinit,
+		NoSelfUpdate: debug,
+	}
+
+	installBinaries(&boot, &upgrader)
+
 	utils.OnDone(ctx, func(_ error) {
 		log.Info().Msg("received a termination signal")
 	})
@@ -205,7 +222,7 @@ func main() {
 	// 4. Start watcher for new version
 	log.Info().Msg("start upgrade daemon")
 
-	upgradeLoop(ctx, &boot, root, debug, monitor, register)
+	upgradeLoop(ctx, &boot, &upgrader, debug, monitor, register)
 }
 
 func getBinsRepo() string {
@@ -246,31 +263,45 @@ func debugReinstall(boot *upgrade.Boot, up *upgrade.Upgrader) {
 	}()
 }
 
-func upgradeLoop(
-	ctx context.Context,
-	boot *upgrade.Boot,
-	root string,
-	debug bool,
-	monitor *monitorStream,
-	register func(string) error) {
+func installBinaries(boot *upgrade.Boot, upgrader *upgrade.Upgrader) {
 
-	zinit, err := zinit.New(zinitSocket)
+	bins, _ := boot.CurrentBins()
+
+	repoWatcher := upgrade.FListRepoWatcher{
+		Repo:    getBinsRepo(),
+		Current: bins,
+	}
+
+	current, toAdd, toDel, err := repoWatcher.Diff()
 	if err != nil {
-		log.Fatal().Err(err).Msg("failed to connect to zinit")
+		log.Error().Err(err).Msg("failed to list latest binaries to install")
 	}
 
-	// with volume allocation is set to nil this flister can be
-	// only used for RO mounts. Otherwise it will panic
-	flister := flist.New(root, nil)
+	for _, pkg := range toDel {
+		if err := upgrader.UninstallBinary(pkg); err != nil {
+			log.Error().Err(err).Str("flist", pkg.Fqdn()).Msg("failed to uninstall flist")
+		}
+	}
 
-	upgrader := upgrade.Upgrader{
-		FLister:      flister,
-		Zinit:        zinit,
-		NoSelfUpdate: debug,
+	for _, pkg := range toAdd {
+		if err := upgrader.InstallBinary(pkg); err != nil {
+			log.Error().Err(err).Str("package", pkg.Fqdn()).Msg("failed to install package")
+		}
 	}
 
+	boot.SetBins(current)
+}
+
+func upgradeLoop(
+	ctx context.Context,
+	boot *upgrade.Boot,
+	upgrader *upgrade.Upgrader,
+	debug bool,
+	monitor *monitorStream,
+	register func(string) error) {
+
 	if debug {
-		debugReinstall(boot, &upgrader)
+		debugReinstall(boot, upgrader)
 	}
 
 	flistWatcher := upgrade.FListSemverWatcher{

pkg/upgrade/watcher.go

@@ -197,20 +197,29 @@ func (w *FListRepoWatcher) diff(packages map[string]RepoFList) (toAdd, toDel []R
 	return
 }
 
+// Diff return the remote changes related to current list of packages
+func (w *FListRepoWatcher) Diff() (all map[string]RepoFList, toAdd, toDell []RepoFList, err error) {
+	all, err = w.list()
+	if err != nil {
+		return all, nil, nil, errors.Wrap(err, "failed to get available packages")
+	}
+
+	toAdd, toDell = w.diff(all)
+	return
+}
+
 // Watch watches a full repo for changes. Event is always of concrete type RepoEvent
 func (w *FListRepoWatcher) Watch(ctx context.Context) (<-chan Event, error) {
 	if w.Duration == time.Duration(0) {
 		//default delay of 5min
 		w.Duration = 600 * time.Second
 	}
 
-	packages, err := w.list()
+	packages, toAdd, toDel, err := w.Diff()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get available packages")
 	}
 
-	toAdd, toDel := w.diff(packages)
-
 	ch := make(chan Event, 1)
 
 	if len(toAdd) > 0 || len(toDel) > 0 {
@@ -236,14 +245,12 @@ func (w *FListRepoWatcher) Watch(ctx context.Context) (<-chan Event, error) {
 				return
 			}
 
-			packages, err := w.list()
+			packages, toAdd, toDel, err := w.Diff()
 			if err != nil {
 				log.Error().Err(err).Str("repo", w.Repo).Msg("failed to list repo flists")
 				continue
 			}
 
-			toAdd, toDel := w.diff(packages)
-
 			if len(toAdd) > 0 || len(toDel) > 0 {
 				select {
 				case ch <- &RepoEvent{