Merge pull request #7806 from bboozzoo/bboozzoo/drop-rpm-rewrite

tests/lib/prepare: drop workarounds for rpmbuild rewriting /bin/sh
snapcore · Nov 28, 2019 · 3654eb1 · 3654eb1
2 parents 4d1ed67 + 2fa0b1f
commit 3654eb1
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
@@ -130,12 +130,6 @@ update_core_snap_for_classic_reexec() {
     rm squashfs-root/usr/lib/snapd/* squashfs-root/usr/bin/snap
     # and copy in the current libexec
     cp -a "$LIBEXECDIR"/snapd/* squashfs-root/usr/lib/snapd/
-    case "$SPREAD_SYSTEM" in
-        fedora-*|centos-*|amazon-*)
-            # RPM can rewrite shebang to #!/usr/bin/sh
-            sed -i -e '1 s;#!/usr/bin/sh;#!/bin/sh;' squashfs-root/usr/lib/snapd/snap-device-helper
-            ;;
-    esac
     # also the binaries themselves
     cp -a /usr/bin/snap squashfs-root/usr/bin/
     # make sure bin/snapctl is a symlink to lib/