From f0dc1565cfe2ab309b235fc088bff4eec40607f7 Mon Sep 17 00:00:00 2001 From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com> Date: Mon, 21 Jul 2025 19:29:56 -0400 Subject: [PATCH] Revert "Update openwrt-overlayfs" This reverts commit 5fdf1a84132887e17572cefcbecc84e0c4feb844. --- .../real_rootfs/usr/sbin/openwrt-overlay.sh | 49 ++++++++++++------ .../installer/openwrt-overlay-sdxlemur.tar.gz | Bin 1473 -> 1585 bytes 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/ipk-source/openwrt-overlay/root/real_rootfs/usr/sbin/openwrt-overlay.sh b/ipk-source/openwrt-overlay/root/real_rootfs/usr/sbin/openwrt-overlay.sh index d1d7a79..be1b344 100755 --- a/ipk-source/openwrt-overlay/root/real_rootfs/usr/sbin/openwrt-overlay.sh +++ b/ipk-source/openwrt-overlay/root/real_rootfs/usr/sbin/openwrt-overlay.sh @@ -34,28 +34,43 @@ newroot() { mkdir -p /rootfs/real_rootfs fi + # Pivot root to the new root /bin/echo "Pivoting Root / to /rootfs; Be back soon!!" /sbin/pivot_root /rootfs /rootfs/real_rootfs >/dev/null 2>&1 # Move the mounted filesystems to the new locations - /bin/echo "Setting up final shared mounts" - /bin/mount --bind /real_rootfs/sys /sys - /bin/mount --bind /real_rootfs/proc /proc - /bin/mount --bind /real_rootfs/tmp /tmp - /bin/mount --bind /real_rootfs/dev /dev - /bin/mount --bind /real_rootfs/firmware /firmware - /bin/mount --bind /real_rootfs/usrdata /usrdata - /bin/mount --bind /real_rootfs/persist /persist - /bin/mount --bind /real_rootfs/cache /cache - /bin/mount --bind /real_rootfs/data /data - /bin/mount --bind /real_rootfs/run /run - /bin/mount --bind /real_rootfs/etc/machine-id /etc/machine-id - /bin/mount --bind /real_rootfs/var/volatile /var/volatile - /bin/mount --bind /real_rootfs/systemrw /systemrw - /bin/mount --bind /etc /real_rootfs/etc + /bin/echo "Moving previous mount points to the new root" + /bin/mount --move /real_rootfs/sys /sys + /bin/mount --move /real_rootfs/proc /proc + /bin/mount --move /real_rootfs/tmp /tmp + /bin/mount --move /real_rootfs/dev /dev + /bin/mount --move /real_rootfs/firmware /firmware + /bin/mount --move /real_rootfs/usrdata /usrdata + /bin/mount --move /real_rootfs/persist /persist + /bin/mount --move /real_rootfs/cache /cache + /bin/mount --move /real_rootfs/data /data + /bin/mount --move /real_rootfs/run /run + /bin/mount --move /real_rootfs/etc/machine-id /etc/machine-id + /bin/mount --move /real_rootfs/var/volatile /var/volatile + /bin/mount --move /real_rootfs/systemrw /systemrw + + # Bind-mount core mountpoints back into real_rootfs for chroot/debug + /bin/echo "Binding previous mount points to the old root" + /bin/mount --bind /dev /real_rootfs/dev + /bin/mount --bind /proc /real_rootfs/proc + /bin/mount --bind /sys /real_rootfs/sys + /bin/mount --bind /tmp /real_rootfs/tmp + /bin/mount --bind /run /real_rootfs/run + /bin/mount --bind /firmware /real_rootfs/firmware + /bin/mount --bind /persist /real_rootfs/persist + /bin/mount --bind /cache /real_rootfs/cache + /bin/mount --bind /data /real_rootfs/data + /bin/mount --bind /systemrw /real_rootfs/systemrw + /bin/mount --bind /usrdata /real_rootfs/usrdata + /bin/mount --bind /etc /real_rootfs/etc + /bin/mount --bind /etc/machine-id /real_rootfs/etc/machine-id + /bin/mount --bind /var/volatile /real_rootfs/var/volatile - # Final remount of orginal rootfs as RO - /bin/mount -o remount,ro /real_rootfs echo "Complete" } diff --git a/opkg-feed/installer/openwrt-overlay-sdxlemur.tar.gz b/opkg-feed/installer/openwrt-overlay-sdxlemur.tar.gz index 2552c91cc88d0ae74037161f0b7fb6444969afaa..2703bedaeace7321d2eaa08d6836ec7c1a8e24a8 100644 GIT binary patch literal 1585 zcmV-12G02(iwFP!000001MOPhZ`(Ey&a?jtrUix#sH5N3L*W8T+W~tRRwOO@Py~S@ z(J@hpR4K}?G3VqmZjJKLC~N7>NQ(n9tW$d4D$sE@g5xo|9*G=9d9DnfBWj{2yH!~`ETR@ zWG0scPh7W^f6tt(`L}&o|83j#Cl|;(-89?rgY*CC10~{a^af`kC#fKePH(Y5d5Zo7 zH~4t-9+hr@W+cXihk*1f$Yb#agGhvFNN_f#Y;=RaeJwuNyt`nOp;9y{V6oLrD` z4s?8L;xExB|I3A6#{Wd;|3T1$|2FqOsH0E*SNuD!C)fXa{_m}{D>VOI_kTz0IF$cw z&wI-Mt|Q~$H!Yq2hro{fUnTzAihuOJNOSA_-m*hHoZC@b%U$VqYaRNI)9im1a$|IE z9ewh@<+w0M{|CYIOGC0RzoIE#a>m5Zzo5TH2%uizaL&-PYy3zkN?1+>nvt(4iIePjqwoA@;F|hoEH5WuoZ3U{ZPCk^bv_U zM(`p+K_U9=Nj5J!7{{}slTrtK*Q>wFN!3m-P>>;xgJ`_uMBt{zvXRtiY)aM?miidH zRgW+D5*g}ssrnCTltPLI304-#z-nX>lq$M@h%#_>HWPqdQnFy;UQV_-r`IqEH6vhn-J~K!%90uSgf7uILh_&_3PfPY zer6fEdnpZ1m6RIxXBY??r%gd6FeCeW8!s7G?Ys6`HE8Mm;21Z@R&k>&FWsqbj@s!~ zlV-6Ns_wvi%$Asgo~iL7Pt)>obM!CD(Kr9THbXVOa$t%ktVRY;@qIbHiuo0S5Uhs1 zrg_U8M!oGJ)6|66tiA;rt?U!rRW+93RlGRElTWf?*$ z-#oeNn#f%>xslgVJXECj%xg6_3_3m4CF^m)*Li+AcvfCydW&k z%6Lo}p(1NecsugPiPT>osQh?F^3p|CE}uwUyGV-!_<~CpSuhromoBn1!jokHtIYbT zORLhC*P+^JzK|5;l2tu)X%hw^P*B`D&0Gzt>xg(xk-T(~l}98A41-WSCJ}1b!0dB`8P zl0EczFg92mwZ(?Y(uF5BT(eEKh=*o`v`MQ-YZ$0aR>e*unA&6upV)MgHrc1x*%eW( z^Q_`vM{u;YDdS)(G+OPh;-DEBdu&f1HV_>wgA8#Xmk{9cZ8P zpQ8TLbtb;%e+bn1KUW=SKmKL?=fs@o^S?o`i~m#Cf%f6QsQ>g`Q`i3vf<647tPZpf z|3&?$=XrYl9|Xtq-@Qz*NBu{!|8soXvvvLF5a_`FH=F)Y{l|9wr)#;o{$mj6`p+M` z{&P?KpR5kFPyR3JKV4V{bp9U#NATafKCplOpV*G8>pzFU5&OU1Iu7Ok?fOsG0dbxG j2Y{~s)X>n-(9qD((9qD((9qD(_5d@4x z$3!L4r6@bbV*mRNDald%lw4c8-SRugvNhxk=Nob;dWejzvlGJxL{XqVohY!IpEb^$ z!1f}~cD&FzvmG~b{WBDt+AxJ8mslWlMsX&1R-~A1mfQFI2L%EC^F=O6mYggOy73Qk zj_=8 z3;&S~a<1<rx%xFw@=qUM*+Vk%Pp<4gl%gY0_b%f!68~;ah zxgt39{jK~5cDUrV4%V?R|GPo( znE!oG&Hu=DO#bf!8}fgh_^)gJ(Z@2)E%W=99pe7nj<&Vjly2A7p&vNS{%4^!MyJ-% zCI35tug`x&*W~{`u-q7*P)BS210V9g3;cVL>lyz0z>XKAqv_E62V42~?I5iAcRdI8 ziB9ChcERNT9`O9!QtYd@Xh!CObNTCU=&u0+=m#X8aP;gIxu*wVy9+Nyr zlA{cNB?zM;$9E|~DqH7M44Hn+1zOulJR9hqpQCqN#AIBg=>iq3?AL;==&IgN|&4-$k+(PxjcMcKhH9haR{I^ext|E>nrIK4nPM}pvFI2TlsRgG06rO|pS*-%*N zj8&58wC7bgHQmuT z-CCttE`{n(U_Rw@B0$f`x+td8>h`Ji7nSv^zc1ZT+gBN;X(HM(xJz%V;nmD95KO_^ z>?O@>?y#C|_qnDi{KQR-==q@HN=46=nn#wJ^Hu8?=oQRK9DhYQ=j{Bvnjt!!JVxV^ zr%eXFv=TD27%T+Heff*?$kD8Hgrbq^Nz_K;dn|bD)j_oQ7AwEW2+?PL<(+d*V)%#s}i=(wApvoCM zo2Eo%y}y?`gCF^v+h8;5)O1Q69p3+4Ti1Vhp>66vdO^)UIbj`Om-C;p{?GTq$nf6> zn*5)t4zL^ls{SvuLv#Mq3pVk8>^i_M{Fn8Ak#C#&&t9;D|D)9bcHzIQ{|kb^tpB~> zaQ@quiFNq@zufHxds z|FZtihjqZ@|2}X4|DEf@y66AU^?XzR*9Q*R|8>@}FaNLC|M{Nz|GyuY`ac5$0|NsC b0|NsC0|NsC0|Ntt|1bUlr3Smg08jt`VB-eu