Merge pull request #157 from Luap99/argv0

emulators should preserve argv0

Author: openshift-merge-bot[bot]

podman-image/build_common.sh

@@ -118,4 +118,4 @@ dnf -y clean all
 
 systemctl enable rhsmcertd.service
 # Patching qemu backed binfmt configurations to use the actual executable's permissions and not the interpreter's
-for x in /usr/lib/binfmt.d/*.conf; do sed 's/\(:[^C:]*\)$/\1C/' "$x" | tee /etc/binfmt.d/"$(basename "$x")"; done
+for x in /usr/lib/binfmt.d/*.conf; do sed 's/\(:[^C:]*\)$/\1PC/' "$x" | tee /etc/binfmt.d/"$(basename "$x")"; done

podman-image/rosetta-activation.sh

@@ -5,7 +5,7 @@ set -e
 mount -t virtiofs -o context=system_u:object_r:nfs_t:s0 rosetta /mnt || exit 0
 
 # register rosetta handler
-echo ":rosetta:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00:\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/mnt/rosetta:FC" >/proc/sys/fs/binfmt_misc/register
+echo ":rosetta:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00:\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/mnt/rosetta:FPC" >/proc/sys/fs/binfmt_misc/register
 
 # unregister qemu handler
 echo -1 >/proc/sys/fs/binfmt_misc/qemu-x86_64

verify/basic_test.go

@@ -110,6 +110,15 @@ var _ = Describe("run basic podman commands", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(archSession).To(Exit(0))
 			Expect(archSession.outputToString()).To(Equal(expectedArch))
+
+			// check that argv[0] is preserved
+			argvTestCommand := []string{"run", "--quiet", "--platform", "linux/" + goArch, imgName, "sh", "-c", "echo $0"}
+			argvSession, err := mb.setCmd(argvTestCommand).run()
+			Expect(err).ToNot(HaveOccurred())
+			Expect(argvSession).To(Exit(0))
+			// Equal is important as we need an exact match for "sh" which means the emulator preserved argv[0].
+			// Previously it would show the executable path "/bin/sh".
+			Expect(argvSession.outputToString()).To(Equal("sh"))
 		}
 
 		// Stop machine