Revert "image_signing: set correct security.selinux attribute for lsb-release"

This reverts commit 8bf8189efd53c17ad8ae04c65e8e299c041bed5a.

BUG=none
TEST=none

Change-Id: I69dae2cf32907fcdacbaab20eaec98ae1549343f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1626767
Reviewed-by: Duncan Laurie <dlaurie@google.com>
Commit-Queue: Duncan Laurie <dlaurie@google.com>
Tested-by: Duncan Laurie <dlaurie@google.com>

4 files changed, 0 insertions, 10 deletions

diff --git a/scripts/image_signing/common.sh b/scripts/image_signing/common.sh
index 8f5aac04..f2fedfa2 100644
--- a/scripts/image_signing/common.sh
+++ b/scripts/image_signing/common.sh
@@ -145,12 +145,6 @@ get_boardvar_from_lsb_release() {
   get_board_from_lsb_release "$@" | sed 's:[-]:_:g'
 }
 
-# Usage: restore_lsb_selinux lsb-file
-# restore lsb-release security.selinux attribute
-restore_lsb_selinux() {
-  sudo setfattr -n security.selinux -v "u:object_r:cros_conf_file:s0" "$1"
-}
-
 # This will override the trap set in common_minmal.sh
 trap "cleanup" INT TERM EXIT
 
diff --git a/scripts/image_signing/remove_test_label.sh b/scripts/image_signing/remove_test_label.sh
index 18a7978a..2df7c02d 100755
--- a/scripts/image_signing/remove_test_label.sh
+++ b/scripts/image_signing/remove_test_label.sh
@@ -17,4 +17,3 @@ loopdev=$(loopback_partscan "${image}")
 rootfs=$(make_temp_dir)
 mount_loop_image_partition "${loopdev}" 3 "${rootfs}"
 sed -i 's/test//' "${rootfs}/etc/lsb-release"
-restore_lsb_selinux "${rootfs}/etc/lsb-release"
diff --git a/scripts/image_signing/set_channel.sh b/scripts/image_signing/set_channel.sh
index dc212465..0ab4ef16 100755
--- a/scripts/image_signing/set_channel.sh
+++ b/scripts/image_signing/set_channel.sh
@@ -40,7 +40,6 @@ main() {
     sudo="sudo"
   fi
   ${sudo} sed -i "s/\b${from}\b/${to}/" "${lsb}" &&
-    restore_lsb_selinux "${lsb}" &&
     echo "Channel change successful."
   cat "${lsb}"
 }
diff --git a/scripts/image_signing/tag_image.sh b/scripts/image_signing/tag_image.sh
index 8a010121..b130fa19 100755
--- a/scripts/image_signing/tag_image.sh
+++ b/scripts/image_signing/tag_image.sh
@@ -170,7 +170,6 @@ process_all_lsb_mods() {
     fi
     if [ ${do_modifications} = ${FLAGS_TRUE} ]; then
       ${sudo} sed -i 's/\btest\b//' "${lsb}" &&
-        restore_lsb_selinux "${lsb}" &&
         echo "Test Label removed from /etc/lsb-release"
     fi
   fi
@@ -181,7 +180,6 @@ process_all_lsb_mods() {
     fi
     if [ ${do_modifications} = ${FLAGS_TRUE} ]; then
       ${sudo} sed -i 's/\bdev\b/beta/' "${lsb}" &&
-        restore_lsb_selinux "${lsb}" &&
         echo "Dev Channel Label was changed to Beta"
     fi
   fi