RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 16:45:09 +00:00
Code Issues Activity Actions

Meta: Fix problematic e2fsck behavior (Debian)

Browse source 
Under Debian `e2fsck` is found in `/sbin/` which does not match the
existing "version" the script currently uses (`/usr/sbin/e2fsck`
versus `/sbin/e2fsck`); therefore I added a simple `if` condition to
remedy the situation by verifying whether the original path exists or
not, so I can use the one Debian expects.

Special thanks goes to Tim Flynn a.k.a. `trflynn89` for his valuable
feedback.
This commit is contained in:
Στέφανος 2022-02-04 16:28:00 +02:00 • committed by Brian Gianforcaro
parent 2212aa2388
commit 43d706a29e
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meta/build-image-qemu.sh
View file

@ -74,6 +74,12 @@ DISK_SIZE_BYTES=$((($(disk_usage "$SERENITY_SOURCE_DIR/Base") + $(disk_usage Roo
DISK_SIZE_BYTES=$(((DISK_SIZE_BYTES + (INODE_COUNT * INODE_SIZE * 2)) * 3)) DISK_SIZE_BYTES=$(((DISK_SIZE_BYTES + (INODE_COUNT * INODE_SIZE * 2)) * 3))
INODE_COUNT=$((INODE_COUNT * 7)) INODE_COUNT=$((INODE_COUNT * 7))
E2FSCK="/usr/sbin/e2fsck"
if [ ! -f "$E2FSCK" ]; then
E2FSCK=/sbin/e2fsck
fi
USE_EXISTING=0 USE_EXISTING=0
if [ -f _disk_image ]; then if [ -f _disk_image ]; then
@ -81,7 +87,7 @@ if [ -f _disk_image ]; then
echo "checking existing image" echo "checking existing image"
result=0 result=0
/usr/sbin/e2fsck -f -y _disk_image || result=$? "$E2FSCK" -f -y _disk_image || result=$?
if [ $result -ge 4 ]; then if [ $result -ge 4 ]; then
rm -f _disk_image rm -f _disk_image
USE_EXISTING=0 USE_EXISTING=0