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üller peter.mueller@ipfire.org --- config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
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üller
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üller peter.mueller@ipfire.org
config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
Hello,
The pointer: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/installer/hw.c;h=12f8e...
-Michael
On 13 Jul 2022, at 20:48, Peter Müller peter.mueller@ipfire.org 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üller
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üller peter.mueller@ipfire.org
config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
Hello Michael,
gee, thank you. :-)
Are you otherwise fine with this patch?
Thanks, and best regards, Peter Müller
Hello,
The pointer: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/installer/hw.c;h=12f8e...
-Michael
On 13 Jul 2022, at 20:48, Peter Müller peter.mueller@ipfire.org 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üller
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üller peter.mueller@ipfire.org
config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
Hello,
Yes, it isn’t great to edit such files with sed, but there are no other options.
I would however prefer to merge it only together with the changes to the installer. Otherwise we are shipping a small change over the course of three updates.
-Michael
On 14 Jul 2022, at 11:15, Peter Müller peter.mueller@ipfire.org wrote:
Hello Michael,
gee, thank you. :-)
Are you otherwise fine with this patch?
Thanks, and best regards, Peter Müller
Hello,
The pointer: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/installer/hw.c;h=12f8e...
-Michael
On 13 Jul 2022, at 20:48, Peter Müller peter.mueller@ipfire.org 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üller
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üller peter.mueller@ipfire.org
config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
Hello Michael,
Hello,
Yes, it isn’t great to edit such files with sed, but there are no other options.
I would however prefer to merge it only together with the changes to the installer. Otherwise we are shipping a small change over the course of three updates.
yes, absolutely. I will send in a patch for the installer later today.
Thanks, and best regards, Peter Müller
-Michael
On 14 Jul 2022, at 11:15, Peter Müller peter.mueller@ipfire.org wrote:
Hello Michael,
gee, thank you. :-)
Are you otherwise fine with this patch?
Thanks, and best regards, Peter Müller
Hello,
The pointer: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/installer/hw.c;h=12f8e...
-Michael
On 13 Jul 2022, at 20:48, Peter Müller peter.mueller@ipfire.org 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üller
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üller peter.mueller@ipfire.org
config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
Hello *,
Hello Michael,
Hello,
Yes, it isn’t great to edit such files with sed, but there are no other options.
I would however prefer to merge it only together with the changes to the installer. Otherwise we are shipping a small change over the course of three updates.
yes, absolutely. I will send in a patch for the installer later today.
https://patchwork.ipfire.org/project/ipfire/patch/de573afc-f8ed-1cf8-949d-82... - here it is, apologies for the tardy response.
Thanks, and best regards, Peter Müller
Thanks, and best regards, Peter Müller
-Michael
On 14 Jul 2022, at 11:15, Peter Müller peter.mueller@ipfire.org wrote:
Hello Michael,
gee, thank you. :-)
Are you otherwise fine with this patch?
Thanks, and best regards, Peter Müller
Hello,
The pointer: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/installer/hw.c;h=12f8e...
-Michael
On 13 Jul 2022, at 20:48, Peter Müller peter.mueller@ipfire.org 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üller
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üller peter.mueller@ipfire.org
config/rootfiles/core/170/update.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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
Looks good to me. You can merge it with the next sweep.
-Michael
On 28 Jul 2022, at 14:29, Peter Müller peter.mueller@ipfire.org wrote:
Hello *,
Hello Michael,
Hello,
Yes, it isn’t great to edit such files with sed, but there are no other options.
I would however prefer to merge it only together with the changes to the installer. Otherwise we are shipping a small change over the course of three updates.
yes, absolutely. I will send in a patch for the installer later today.
https://patchwork.ipfire.org/project/ipfire/patch/de573afc-f8ed-1cf8-949d-82...
- here it is, apologies for the tardy response.
Thanks, and best regards, Peter Müller
Thanks, and best regards, Peter Müller
-Michael
On 14 Jul 2022, at 11:15, Peter Müller peter.mueller@ipfire.org wrote:
Hello Michael,
gee, thank you. :-)
Are you otherwise fine with this patch?
Thanks, and best regards, Peter Müller
Hello,
The pointer: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/installer/hw.c;h=12f8e...
-Michael
On 13 Jul 2022, at 20:48, Peter Müller peter.mueller@ipfire.org 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üller
> 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üller peter.mueller@ipfire.org > --- > config/rootfiles/core/170/update.sh | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/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 >
-
Michael Tremer -
Peter Müller