shuguang/reinstall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: lint

Browse Source
This commit is contained in:
bin456789 2023-12-05 22:32:54 +08:00
parent 4663800196
commit 4fd0011bd7
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resize.sh
View File

@ -29,33 +29,33 @@ if [ -n "$installer_num" ]; then
# 要添加 LC_NUMERIC 或者将%转义成\%才能在cron里正确运行 # 要添加 LC_NUMERIC 或者将%转义成\%才能在cron里正确运行
# locale -a 不一定有"en_US.UTF-8"，但肯定有"C.UTF-8" # locale -a 不一定有"en_US.UTF-8"，但肯定有"C.UTF-8"
LC_NUMERIC="C.UTF-8" LC_NUMERIC="C.UTF-8"
printf "d\n%s\nw" "$installer_num" | fdisk /dev/$xda printf "d\n%s\nw" "$installer_num" | fdisk "/dev/$xda"
update_part /dev/$xda update_part "/dev/$xda"
fi fi
# 找出现在的最后一个分区，也就是系统分区 # 找出现在的最后一个分区，也就是系统分区
# el7 的 lsblk 没有 --sort，所以用其他方法 # el7 的 lsblk 没有 --sort，所以用其他方法
# shellcheck disable=2012 # shellcheck disable=2012
part_num=$(ls -1v /dev/$xda* | tail -1 | grep -o '[0-9]*$') part_num=$(ls -1v "/dev/$xda"* | tail -1 | grep -o '[0-9]*$')
part_fstype=$(lsblk -no FSTYPE /dev/$xda*$part_num) part_fstype=$(lsblk -no FSTYPE "/dev/$xda"*"$part_num")
# 扩容分区 # 扩容分区
# ubuntu 和 el7 用 growpart，其他用 parted # ubuntu 和 el7 用 growpart，其他用 parted
# el7 不能用parted在线扩容，而fdisk扩容会改变 PARTUUID，所以用 growpart # el7 不能用parted在线扩容，而fdisk扩容会改变 PARTUUID，所以用 growpart
if grep -E -i 'centos:7|ubuntu' /etc/os-release; then if grep -E -i 'centos:7|ubuntu' /etc/os-release; then
growpart /dev/$xda $part_num growpart "/dev/$xda" "$part_num"
else else
printf 'yes\n100%%' | parted /dev/$xda resizepart $part_num ---pretend-input-tty printf 'yes\n100%%' | parted "/dev/$xda" resizepart "$part_num" ---pretend-input-tty
fi fi
update_part /dev/$xda update_part "/dev/$xda"
# 扩容最后一个分区的文件系统 # 扩容最后一个分区的文件系统
case $part_fstype in case $part_fstype in
xfs) xfs_growfs / ;; xfs) xfs_growfs / ;;
ext*) resize2fs /dev/$xda*$part_num ;; ext*) resize2fs "/dev/$xda"*"$part_num" ;;
btrfs) btrfs filesystem resize max / ;; btrfs) btrfs filesystem resize max / ;;
esac esac
update_part /dev/$xda update_part "/dev/$xda"
# 删除脚本自身 # 删除脚本自身
rm -f /resize.sh /etc/cron.d/resize rm -f /resize.sh /etc/cron.d/resize

4
ubuntu-storage-early.sh
View File

@ -27,7 +27,7 @@ xda=$(get_xda)
# https://curtin.readthedocs.io/en/latest/topics/storage.html # https://curtin.readthedocs.io/en/latest/topics/storage.html
size_os=$(lsblk -bn -o SIZE /dev/disk/by-label/os) size_os=$(lsblk -bn -o SIZE /dev/disk/by-label/os)
if parted /dev/$xda print | grep '^Partition Table' | grep gpt; then if parted "/dev/$xda" print | grep '^Partition Table' | grep gpt; then
# efi # efi
if [ -e /dev/disk/by-label/efi ]; then if [ -e /dev/disk/by-label/efi ]; then
size_efi=$(lsblk -bn -o SIZE /dev/disk/by-label/efi) size_efi=$(lsblk -bn -o SIZE /dev/disk/by-label/efi)
@ -74,7 +74,7 @@ if parted /dev/$xda print | grep '^Partition Table' | grep gpt; then
EOF EOF
else else
# bios > 2t # bios > 2t
size_biosboot=$(parted /dev/$xda unit b print | grep bios_grub | awk '{print $4}' | sed 's/B$//') size_biosboot=$(parted "/dev/$xda" unit b print | grep bios_grub | awk '{print $4}' | sed 's/B$//')
cat <<EOF >>/autoinstall.yaml cat <<EOF >>/autoinstall.yaml
config: config:
# disk # disk