From 59e40648d0d9e5030dc6ef572badb6ae882ccd8a Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Wed, 31 Jan 2024 08:10:51 +0100 Subject: [PATCH] move openwrt additional files --- Dockerfile | 2 +- .../{fw_wan_open_http.sh => bin/fw_wan_open_http} | 0 .../{fw_wan_open_ssh.sh => bin/fw_wan_open_ssh} | 0 src/entry.sh | 6 ++++-- 4 files changed, 5 insertions(+), 3 deletions(-) rename openwrt_additional/{fw_wan_open_http.sh => bin/fw_wan_open_http} (100%) rename openwrt_additional/{fw_wan_open_ssh.sh => bin/fw_wan_open_ssh} (100%) diff --git a/Dockerfile b/Dockerfile index 3c7b071..926576a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir /var/vm \ COPY ./src /run/ COPY ./web /var/www/ -COPY ./openwrt_additional /var/vm/ +COPY ./openwrt_additional /var/vm/openwrt_additional RUN chmod +x /run/*.sh RUN mv /var/www/nginx.conf /etc/nginx/http.d/web.conf diff --git a/openwrt_additional/fw_wan_open_http.sh b/openwrt_additional/bin/fw_wan_open_http similarity index 100% rename from openwrt_additional/fw_wan_open_http.sh rename to openwrt_additional/bin/fw_wan_open_http diff --git a/openwrt_additional/fw_wan_open_ssh.sh b/openwrt_additional/bin/fw_wan_open_ssh similarity index 100% rename from openwrt_additional/fw_wan_open_ssh.sh rename to openwrt_additional/bin/fw_wan_open_ssh diff --git a/src/entry.sh b/src/entry.sh index fb65dcc..4f0bd9e 100755 --- a/src/entry.sh +++ b/src/entry.sh @@ -55,9 +55,11 @@ else cp /var/vm/rootfs.img.gz /storage/rootfs.img.gz gzip -d /storage/rootfs.img.gz - info "Copy some additional files into the image" + info "Inject some additional files into the image" mount /storage/rootfs.img /mnt - cp /var/vm/* /mnt/root + # 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/ umount /mnt fi