From 2863e8f63b49488d75670b9734b76f2eaeb021e1 Mon Sep 17 00:00:00 2001
From: Albrecht Lohofener <albrechtloh@gmx.de>
Date: Tue, 26 Mar 2024 20:31:59 +0100
Subject: [PATCH] Restructure folder openwrt_additional a bit

---
 openwrt_additional/{ => etc}/rc.local                       | 0
 openwrt_additional/{ => usr}/bin/fw_wan_open_http           | 0
 openwrt_additional/{ => usr}/bin/fw_wan_open_ssh            | 0
 .../{ => usr}/bin/restore_install_packages_from_backup      | 0
 src/install_openwrt_rootfs.sh                               | 6 +++---
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename openwrt_additional/{ => etc}/rc.local (100%)
 rename openwrt_additional/{ => usr}/bin/fw_wan_open_http (100%)
 rename openwrt_additional/{ => usr}/bin/fw_wan_open_ssh (100%)
 rename openwrt_additional/{ => usr}/bin/restore_install_packages_from_backup (100%)

diff --git a/openwrt_additional/rc.local b/openwrt_additional/etc/rc.local
similarity index 100%
rename from openwrt_additional/rc.local
rename to openwrt_additional/etc/rc.local
diff --git a/openwrt_additional/bin/fw_wan_open_http b/openwrt_additional/usr/bin/fw_wan_open_http
similarity index 100%
rename from openwrt_additional/bin/fw_wan_open_http
rename to openwrt_additional/usr/bin/fw_wan_open_http
diff --git a/openwrt_additional/bin/fw_wan_open_ssh b/openwrt_additional/usr/bin/fw_wan_open_ssh
similarity index 100%
rename from openwrt_additional/bin/fw_wan_open_ssh
rename to openwrt_additional/usr/bin/fw_wan_open_ssh
diff --git a/openwrt_additional/bin/restore_install_packages_from_backup b/openwrt_additional/usr/bin/restore_install_packages_from_backup
similarity index 100%
rename from openwrt_additional/bin/restore_install_packages_from_backup
rename to openwrt_additional/usr/bin/restore_install_packages_from_backup
diff --git a/src/install_openwrt_rootfs.sh b/src/install_openwrt_rootfs.sh
index 30ae353..186c19d 100644
--- a/src/install_openwrt_rootfs.sh
+++ b/src/install_openwrt_rootfs.sh
@@ -19,11 +19,11 @@ else
     mount /storage/rootfs-${OPENWRT_IMAGE_ID}.img /mnt
     # mount -o offset=$((512*262656)) /storage/disk.img /mnt # combined image ext4 partition starts at offset 262656
     
-    chmod +x /var/vm/openwrt_additional/bin/*
-    cp /var/vm/openwrt_additional/bin/* /mnt/usr/bin/
+    chmod +x /var/vm/openwrt_additional/usr/bin/*
+    cp /var/vm/openwrt_additional/usr/bin/* /mnt/usr/bin/
 
     mv /mnt/etc/rc.local /mnt/etc/rc.local.orig
-    cp /var/vm/openwrt_additional/rc.local /mnt/etc/rc.local
+    cp /var/vm/openwrt_additional/etc/rc.local /mnt/etc/rc.local
     chmod +x /mnt/etc/rc.local
 
     info "Install additional IPKs into the image"