Skip to content

[202012] Run tune2fs during initramfs instead of image install #10558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saiarcot895 merged 1 commit into from
Apr 13, 2022
Merged

[202012] Run tune2fs during initramfs instead of image install #10558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions files/Aboot/boot0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,6 @@ extract_image() {
local rootdev="$(echo $mountstr | cut -f1 -d' ')"
rootfs_type="$(echo $mountstr | cut -d' ' -f3)"

## Don't reserve any blocks just for root
tune2fs -m 0 -r 0 $rootdev

info "Extracting $dockerfs from swi"
## Unpacking dockerfs delayed
## 1. when disk is vfat as it does not support symbolic link
Expand Down
1 change: 1 addition & 0 deletions files/initramfs-tools/mke2fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ copy_exec /usr/sbin/mke2fs /usr/local/sbin/
copy_exec /sbin/sfdisk
copy_exec /sbin/fdisk
copy_exec /sbin/resize2fs
copy_exec /sbin/tune2fs
copy_exec /sbin/findfs

fstypes="ext4 ext3"
Expand Down
1 change: 1 addition & 0 deletions files/initramfs-tools/union-mount.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ case "${ROOT}" in
*)
## Mount the raw partition again
mount ${ROOT} ${rootmnt}/host
tune2fs -m 0 -r 0 ${ROOT}
;;
esac

Expand Down
5 changes: 0 additions & 5 deletions installer/arm64/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ elif [ "$install_env" = "sonic" ]; then
rm -rf $f
fi
done

demo_dev=$(findmnt -n -o SOURCE --target /host)

# Don't reserve any blocks just for root
tune2fs -m 0 -r 0 $demo_dev
fi

# Create target directory or clean it up if exists
Expand Down
5 changes: 0 additions & 5 deletions installer/armhf/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ elif [ "$install_env" = "sonic" ]; then
rm -rf $f
fi
done

demo_dev=$(findmnt -n -o SOURCE --target /host)

# Don't reserve any blocks just for root
tune2fs -m 0 -r 0 $demo_dev
fi

# Create target directory or clean it up if exists
Expand Down
11 changes: 0 additions & 11 deletions installer/x86_64/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,6 @@ if [ "$install_env" = "onie" ]; then
# Make filesystem
mkfs.ext4 -L $demo_volume_label $demo_dev

# Don't reserve any blocks just for root
tune2fs -m 0 -r 0 $demo_dev

# Mount demo filesystem
demo_mnt=$(${onie_bin} mktemp -d) || {
echo "Error: Unable to create file system mount point"
Expand Down Expand Up @@ -469,20 +466,12 @@ elif [ "$install_env" = "sonic" ]; then
rm -rf $f
fi
done

demo_dev=$(findmnt -n -o SOURCE --target /host)

# Don't reserve any blocks just for root
tune2fs -m 0 -r 0 $demo_dev
else
demo_mnt="build_raw_image_mnt"
demo_dev=$cur_wd/"%%OUTPUT_RAW_IMAGE%%"

mkfs.ext4 -L $demo_volume_label $demo_dev

# Don't reserve any blocks just for root
tune2fs -m 0 -r 0 $demo_dev

echo "Mounting $demo_dev on $demo_mnt..."
mkdir $demo_mnt
mount -t auto -o loop $demo_dev $demo_mnt
Expand Down