Merge pull request #201 from gustavosbarreto/mount_usb

updatehub-server: add cli options for mounting usb disk

cmd/updatehub-server/main.go

@@ -12,9 +12,11 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"syscall"
 	"time"
 
 	"github.com/OSSystems/pkg/log"
+	linuxproc "github.com/c9s/goprocinfo/linux"
 	"github.com/parnurzeal/gorequest"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -61,6 +63,8 @@ func main() {
 	isQuiet := cmd.PersistentFlags().Bool("quiet", false, "sets the log level to 'error'")
 	isDebug := cmd.PersistentFlags().Bool("debug", false, "sets the log level to 'debug'")
 	wait := cmd.PersistentFlags().Bool("wait", false, "wait for UpdateHub Agent")
+	mount := cmd.PersistentFlags().StringP("mount", "m", "", "device to mount")
+	fstype := cmd.PersistentFlags().StringP("fstype", "f", "", "filesystem type of device to mount")
 
 	err := cmd.Execute()
 	if err != nil {
@@ -94,6 +98,26 @@ func main() {
 		os.Exit(1)
 	}
 
+	if *mount != "" {
+		mounts, err := linuxproc.ReadMounts("/proc/mounts")
+		if err != nil {
+			log.Fatal(err)
+			os.Exit(1)
+		}
+
+		for _, mount := range mounts.Mounts {
+			if mount.MountPoint == path {
+				log.Fatalf("%s: already mounted", path)
+				os.Exit(1)
+			}
+		}
+
+		if err = syscall.Mount(*mount, path, *fstype, syscall.MS_RDONLY, ""); err != nil {
+			log.Fatal(err)
+			os.Exit(1)
+		}
+	}
+
 	err = backend.ProcessDirectory()
 	if err != nil {
 		log.Fatal(err)

cmd/updatehub-server/udev.rules

@@ -1,2 +1,14 @@
-ENV{ID_FS_LABEL}=="updatehub|UPDATEHUB", ENV{DEVTYPE}=="partition", ACTION=="add", RUN+="/bin/mkdir -p /mnt/updatehub", RUN+="/bin/mount -o ro /dev/%k /mnt/updatehub", RUN+="/usr/bin/updatehub-server --wait /mnt/updatehub"
-ENV{ID_FS_LABEL}=="updatehub|UPDATEHUB", ENV{DEVTYPE}=="partition", ACTION=="remove", RUN+="/bin/umount /mnt/updatehub", RUN+="/bin/rm -rf /mnt/updatehub"
+ENV{ID_FS_LABEL}=="updatehub|UPDATEHUB", \
+  ENV{DEVTYPE}=="partition", \
+  ACTION=="add", \
+  SUBSYSTEM=="block", \
+  RUN+="/bin/mkdir -p /mnt/updatehub", \
+  RUN+="/bin/mount -o ro /dev/%k /mnt/updatehub", \
+  RUN+="/bin/sh -c '/bin/echo /usr/bin/updatehub-server --mount /dev/%k --fstype $env{ID_FS_TYPE} --wait /mnt/updatehub | at -M now'"
+
+ENV{ID_FS_LABEL}=="updatehub|UPDATEHUB", \
+  ENV{DEVTYPE}=="partition", \
+  ACTION=="remove", \
+  RUN+="/usr/bin/killall updatehub-server", \
+  RUN+="/bin/umount /mnt/updatehub", \
+  RUN+="/bin/rm -rf /mnt/updatehub"

glide.yaml

@@ -20,3 +20,6 @@ import:
 - package: github.com/koofr/go-httputils
 - package: github.com/updatehub/agent-sdk-go
   version: v1
+- package: github.com/c9s/goprocinfo
+  subpackages:
+  - linux