[PATCH 1/2] partresize: remove buggy code

[PATCH 1/2] partresize: remove buggy code

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

DRV is not defined so this code is useless.

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 src/initscripts/system/partresize | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index 272fbe482..832bc7237 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -112,11 +112,6 @@ case "${1}" in
 					boot_mesg "Growing root partition to maximum size..."
 					echo -e ',+' | sfdisk --no-reread -f -N${part_num} "${root_dev}" 2>/dev/null
 
-					# Update c,h,s values of the boot partition...
-					if [ ${part_num} -ne 1 -a -b "${root_dev}1" ]; then
-						echo -e ',' | sfdisk --no-reread -f -N1 ${DRV} &> /dev/null
-					fi
-
 					# The filesystem should be resized after
 					# this operation
 					touch /.resizefs
-- 
2.38.1

[PATCH 2/2] partresize: enable journal on ssd's and vm's

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 1384 bytes --]

the flashimage is build without journal to not destroy
usb thumbdrives or sd cards. On real ssd's and virtual
machines it should enabled for higher data security.

So this patch add the journal is drive support smart.

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 src/initscripts/system/partresize | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index 832bc7237..df9c43991 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -48,6 +48,7 @@ case "${1}" in
 			# Azure and Google Compute Platform
 			if running_on_ec2 || running_on_oci || running_on_azure || running_on_gcp; then
 				scon="on"
+				journal="on"
 			fi
 
 			mount /boot > /dev/null
@@ -109,6 +110,18 @@ case "${1}" in
 						root_dev="${dev::-2}"
 					fi
 
+					# Check if the device support smart
+					smartctl --smart=on "${root_dev}" > /dev/null
+					if [ ${?} = 0 ]; then
+						journal="on"
+					fi
+
+					# Enable journal
+					if [ "${journal}" = "on" ]; then
+						boot_mesg "Create journal on "${dev}" ..."
+						tune2fs -O has_journal "${dev}"
+					fi
+
 					boot_mesg "Growing root partition to maximum size..."
 					echo -e ',+' | sfdisk --no-reread -f -N${part_num} "${root_dev}" 2>/dev/null
 
-- 
2.38.1

[PATCH 1/2] partresize: remove buggy code

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

DRV is not defined so this code is useless.

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 src/initscripts/system/partresize | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index 272fbe482..832bc7237 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -112,11 +112,6 @@ case "${1}" in
 					boot_mesg "Growing root partition to maximum size..."
 					echo -e ',+' | sfdisk --no-reread -f -N${part_num} "${root_dev}" 2>/dev/null
 
-					# Update c,h,s values of the boot partition...
-					if [ ${part_num} -ne 1 -a -b "${root_dev}1" ]; then
-						echo -e ',' | sfdisk --no-reread -f -N1 ${DRV} &> /dev/null
-					fi
-
 					# The filesystem should be resized after
 					# this operation
 					touch /.resizefs
-- 
2.38.1