From 00f2577c2b040e461c298512484d71d1ab90fcca Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 22 Aug 2020 19:13:52 +0000
Subject: [PATCH] fix rootfs ownership

---
 .github/workflows/r1s_lean.yml         | 1 +
 .github/workflows/r1s_lean_h3.yml      | 1 +
 .github/workflows/r1s_lienol.yml       | 1 +
 .github/workflows/r2s_lean.yml         | 1 +
 .github/workflows/r2s_lean_minimal.yml | 2 +-
 .github/workflows/r2s_lienol.yml       | 1 +
 fix_ownership.sh                       | 6 ++++++
 7 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 fix_ownership.sh

diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml
index c51888c..f5fb05d 100644
--- a/.github/workflows/r1s_lean.yml
+++ b/.github/workflows/r1s_lean.yml
@@ -122,6 +122,7 @@ jobs:
           cd friendlywrt-h5
           sed -i '130,150 {/build_friendlywrt/d}' scripts/build.sh
           ./build.sh nanopi_r1s.mk
+          sudo bash fix_ownership.sh
 
       - name: Zip Files
         run: |
diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml
index da98dd8..5c63a04 100644
--- a/.github/workflows/r1s_lean_h3.yml
+++ b/.github/workflows/r1s_lean_h3.yml
@@ -126,6 +126,7 @@ jobs:
           echo -e '\nCONFIG_TCP_CONG_ADVANCED=y' >> kernel/arch/arm/configs/sunxi_defconfig
           echo -e '\nCONFIG_TCP_CONG_BBR=m' >> kernel/arch/arm/configs/sunxi_defconfig
           ./build.sh nanopi_r1s_h3.mk
+          sudo bash fix_ownership.sh
 
       - name: Zip Files
         run: |
diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml
index 23f865e..dc1dda6 100644
--- a/.github/workflows/r1s_lienol.yml
+++ b/.github/workflows/r1s_lienol.yml
@@ -109,6 +109,7 @@ jobs:
           cd friendlywrt-h5
           sed -i '130,150 {/build_friendlywrt/d}' scripts/build.sh
           ./build.sh nanopi_r1s.mk
+          sudo bash fix_ownership.sh
 
       - name: Zip Files
         run: |
diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml
index 2ab445c..2c0ff0f 100644
--- a/.github/workflows/r2s_lean.yml
+++ b/.github/workflows/r2s_lean.yml
@@ -105,6 +105,7 @@ jobs:
           cd friendlywrt-rk3328
           sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
           ./build.sh nanopi_r2s.mk
+          sudo bash fix_ownership.sh
 
       - name: Zip Files
         run: |
diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml
index ba6eb53..af54e4d 100644
--- a/.github/workflows/r2s_lean_minimal.yml
+++ b/.github/workflows/r2s_lean_minimal.yml
@@ -201,6 +201,7 @@ jobs:
           cd friendlywrt-rk3328
           sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
           ./build.sh nanopi_r2s.mk
+          sudo bash fix_ownership.sh
 
       - name: Zip Files
         run: |
@@ -216,7 +217,6 @@ jobs:
           md5sum *img* > md5sum.txt
           cd ..
           zip -r artifact.zip ./artifact/
-          #release_tag="R2S-Lean-$(date +%Y-%m-%d)-Minimal"
           release_tag="R2S-Minimal-$(date +%Y-%m-%d)"
           echo "##[set-output name=release_tag;]$release_tag"
       - name: Create Release
diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml
index 2930ed4..f9bf5fb 100644
--- a/.github/workflows/r2s_lienol.yml
+++ b/.github/workflows/r2s_lienol.yml
@@ -86,6 +86,7 @@ jobs:
           cd friendlywrt-rk3328
           sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
           ./build.sh nanopi_r2s.mk
+          sudo bash fix_ownership.sh
 
       - name: Zip Files
         run: |
diff --git a/fix_ownership.sh b/fix_ownership.sh
new file mode 100644
index 0000000..52812fc
--- /dev/null
+++ b/fix_ownership.sh
@@ -0,0 +1,6 @@
+LOOP_DEVICE=$(losetup -f)
+losetup -o 100663296 ${LOOP_DEVICE} friendlywrt-*/out/*.img
+rm -rf /mnt/friendlywrt-tmp && mkdir -p /mnt/friendlywrt-tmp
+mount ${LOOP_DEVICE} /mnt/friendlywrt-tmp && chown -R root:root /mnt/friendlywrt-tmp && umount /mnt/friendlywrt-tmp
+losetup -d ${LOOP_DEVICE}
+