From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH v2] Core Update 170: Harden mount options of /boot on existing installations Date: Thu, 14 Jul 2022 10:19:33 +0000 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4287736636726365906==" List-Id: --===============4287736636726365906== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Michael, > Hello, >=20 > Yes, it isn=E2=80=99t great to edit such files with sed, but there are no o= ther options. >=20 > I would however prefer to merge it only together with the changes to the in= staller. Otherwise we are shipping a small change over the course of three up= dates. yes, absolutely. I will send in a patch for the installer later today. Thanks, and best regards, Peter M=C3=BCller >=20 > -Michael >=20 >> On 14 Jul 2022, at 11:15, Peter M=C3=BCller w= rote: >> >> Hello Michael, >> >> gee, thank you. :-) >> >> Are you otherwise fine with this patch? >> >> Thanks, and best regards, >> Peter M=C3=BCller >> >> >>> Hello, >>> >>> The pointer: https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dsrc/= installer/hw.c;h=3D12f8e793de49b65afb4d271f10d6d7717e8a8145;hb=3DHEAD#l1125 >>> >>> -Michael >>> >>>> On 13 Jul 2022, at 20:48, Peter M=C3=BCller = wrote: >>>> >>>> Hello *, >>>> >>>> additionally, we need to ensure /boot mount options are already written = with these flags >>>> into /etc/fstab on new installations. For flash-images, this is already = done in C169, but >>>> I have yet to investigate where to change things for the ISO files. >>>> >>>> Any hints would be appreciated. :-) >>>> >>>> Thanks, and best regards, >>>> Peter M=C3=BCller >>>> >>>> >>>>> The second version of this patch uses @ instead of / for sed delimiters, >>>>> which makes the command less hard to read. Since Core Update 170 already >>>>> requires a reboot at this point, the respective directive is omitted. >>>>> >>>>> Signed-off-by: Peter M=C3=BCller >>>>> --- >>>>> config/rootfiles/core/170/update.sh | 3 +++ >>>>> 1 file changed, 3 insertions(+) >>>>> >>>>> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/cor= e/170/update.sh >>>>> index 7dde03060..78a4709bc 100644 >>>>> --- a/config/rootfiles/core/170/update.sh >>>>> +++ b/config/rootfiles/core/170/update.sh >>>>> @@ -110,6 +110,9 @@ chown nobody:nobody /var/lib/ipblocklist >>>>> # Start services >>>>> /etc/init.d/rc.d/unbound start >>>>> >>>>> +# Harden mount options of /boot >>>>> +sed -e -i "s@[[:space:]]*\/boot[[:space:]]*auto[[:space:]]*defaults[[:= space:]]*@ \/boot auto defaults,nodev,noexec,nosuid @g" /etc/fstab >>>>> + >>>>> # This update needs a reboot... >>>>> touch /var/run/need_reboot >>>>> >>> >=20 --===============4287736636726365906==--