chore: rename MountFS to MountDMG

api/server/routes/ipsw/ipsw.go

@@ -71,7 +71,7 @@ func getFsFiles(c *gin.Context) {
 
 	// mount filesystem DMG
 	utils.Indent(log.Info, 2)(fmt.Sprintf("Mounting %s", dmgPath))
-	mountPoint, alreadyMounted, err := utils.MountFS(dmgPath)
+	mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
 	if err != nil {
 		if !errors.Is(err, utils.ErrMountResourceBusy) {
 			c.AbortWithStatusJSON(http.StatusInternalServerError, types.GenericError{Error: fmt.Sprintf("failed to mount DMG: %v", err)})

cmd/ipsw/cmd/ia.go

@@ -71,7 +71,7 @@ var iaCmd = &cobra.Command{
 		dmgPath := filepath.Join(outDir, "SharedSupport.dmg")
 
 		log.Debugf("Mounting %s", dmgPath)
-		mountPoint, alreadyMounted, err := utils.MountFS(dmgPath)
+		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
 		if err != nil {
 			return fmt.Errorf("failed to mount DMG: %v", err)
 		}

cmd/ipsw/cmd/mdevs.go

@@ -100,7 +100,7 @@ var mdevsCmd = &cobra.Command{
 		}
 		// mount filesystem DMG
 		log.Debugf("Mounting %s", dmgPath)
-		mountPoint, alreadyMounted, err := utils.MountFS(dmgPath)
+		mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
 		if err != nil {
 			return fmt.Errorf("failed to mount DMG: %v", err)
 		}

internal/commands/ent/ent.go

@@ -217,7 +217,7 @@ func scanEnts(ipswPath, dmgPath, dmgType string) (map[string]string, error) {
 	}
 
 	utils.Indent(log.Debug, 2)(fmt.Sprintf("Mounting %s %s", dmgType, dmgPath))
-	mountPoint, alreadyMounted, err := utils.MountFS(dmgPath)
+	mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to mount DMG: %v", err)
 	}

internal/commands/mount/mount.go

@@ -83,7 +83,7 @@ func DmgInIPSW(path, typ string) (*Context, error) {
 		}
 	}
 
-	mp, am, err := utils.MountFS(extractedDMG)
+	mp, am, err := utils.MountDMG(extractedDMG)
 	if err != nil {
 		return nil, fmt.Errorf("failed to mount %s: %v", extractedDMG, err)
 	}

internal/diff/diff.go

@@ -224,7 +224,7 @@ func mountDMG(ctx *Context) (err error) {
 		utils.Indent(log.Debug, 2)(fmt.Sprintf("Found extracted %s", ctx.SystemOsDmgPath))
 	}
 	utils.Indent(log.Info, 2)(fmt.Sprintf("Mounting %s", ctx.SystemOsDmgPath))
-	ctx.MountPath, ctx.IsMounted, err = utils.MountFS(ctx.SystemOsDmgPath)
+	ctx.MountPath, ctx.IsMounted, err = utils.MountDMG(ctx.SystemOsDmgPath)
 	if err != nil {
 		if !errors.Is(err, utils.ErrMountResourceBusy) {
 			return fmt.Errorf("failed to mount DMG: %v", err)

internal/search/search.go

@@ -31,7 +31,7 @@ func scanDmg(ipswPath, dmgPath, dmgType string, handler func(string, *macho.File
 		utils.Indent(log.Debug, 2)(fmt.Sprintf("Found extracted %s", dmgPath))
 	}
 	utils.Indent(log.Debug, 2)(fmt.Sprintf("Mounting %s %s", dmgType, dmgPath))
-	mountPoint, alreadyMounted, err := utils.MountFS(dmgPath)
+	mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
 	if err != nil {
 		return fmt.Errorf("failed to mount DMG: %v", err)
 	}

internal/utils/macos.go

@@ -431,7 +431,7 @@ func IsAlreadyMounted(image, mountPoint string) (string, bool, error) {
 	return "", false, nil
 }
 
-func MountFS(image string) (string, bool, error) {
+func MountDMG(image string) (string, bool, error) {
 	mountPoint := fmt.Sprintf("/tmp/%s.mount", filepath.Base(image))
 
 	if runtime.GOOS == "darwin" {
@@ -554,7 +554,7 @@ func ExtractFromDMG(ipswPath, dmgPath, destPath string, pattern *regexp.Regexp)
 	}
 
 	Indent(log.Info, 2)(fmt.Sprintf("Mounting DMG %s", dmgPath))
-	mountPoint, alreadyMounted, err := MountFS(dmgPath)
+	mountPoint, alreadyMounted, err := MountDMG(dmgPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to IPSW FS dmg: %v", err)
 	}

pkg/dyld/extract.go

@@ -50,7 +50,7 @@ func ExtractFromDMG(i *info.Info, dmgPath, destPath string, arches []string) ([]
 
 	utils.Indent(log.Info, 2)(fmt.Sprintf("Mounting DMG %s", dmgPath))
 	var alreadyMounted bool
-	mountPoint, alreadyMounted, err := utils.MountFS(dmgPath)
+	mountPoint, alreadyMounted, err := utils.MountDMG(dmgPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to IPSW FS dmg: %v", err)
 	}