From 85a0f2fe60a905a2726b10fd8dbccff0458900d4 Mon Sep 17 00:00:00 2001 From: Shyim Date: Tue, 15 Aug 2023 11:26:13 +0200 Subject: [PATCH 1/2] fix: add missing argument for MountSecretFs on darwin --- pkgs/sops-install-secrets/darwin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sops-install-secrets/darwin.go b/pkgs/sops-install-secrets/darwin.go index f1399b95..ce682694 100644 --- a/pkgs/sops-install-secrets/darwin.go +++ b/pkgs/sops-install-secrets/darwin.go @@ -53,7 +53,7 @@ func SecureSymlinkChown(symlinkToCheck string, expectedTarget string, owner, gro // mydev=`hdiutil attach -nomount ram://$NUMSECTORS` // newfs_hfs $mydev // mount -t hfs $mydev /tmp/mymount -func MountSecretFs(mountpoint string, keysGid int, userMode bool) error { +func MountSecretFs(mountpoint string, keysGid int, useTmpfs bool, userMode bool) error { if err := os.MkdirAll(mountpoint, 0751); err != nil { return fmt.Errorf("Cannot create directory '%s': %w", mountpoint, err) } From 2557741644f883c76846e542d1a1404b31a9ebcf Mon Sep 17 00:00:00 2001 From: Shyim Date: Thu, 17 Aug 2023 08:22:42 +0200 Subject: [PATCH 2/2] Update pkgs/sops-install-secrets/darwin.go Co-authored-by: Leo Pang <34628052+allthatjazzleo@users.noreply.github.com> --- pkgs/sops-install-secrets/darwin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sops-install-secrets/darwin.go b/pkgs/sops-install-secrets/darwin.go index ce682694..523b2e8e 100644 --- a/pkgs/sops-install-secrets/darwin.go +++ b/pkgs/sops-install-secrets/darwin.go @@ -53,7 +53,7 @@ func SecureSymlinkChown(symlinkToCheck string, expectedTarget string, owner, gro // mydev=`hdiutil attach -nomount ram://$NUMSECTORS` // newfs_hfs $mydev // mount -t hfs $mydev /tmp/mymount -func MountSecretFs(mountpoint string, keysGid int, useTmpfs bool, userMode bool) error { +func MountSecretFs(mountpoint string, keysGid int, _useTmpfs bool, userMode bool) error { if err := os.MkdirAll(mountpoint, 0751); err != nil { return fmt.Errorf("Cannot create directory '%s': %w", mountpoint, err) }