Merge branch 'github-pull-41' into for-master

This adds filesystem resize when the partition is resized. This
functionality is not available for all filesystems, but only for
ext2/ext3/ext4, xfs, f2fs.

Link: #41
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

Author: legionus

features/kickstart/config.mk

@@ -3,7 +3,8 @@ $(call feature-requires,devmapper luks lvm mdadm modules-filesystem system-glibc
 
 KICKSTART_PROGS  = sfdisk wipefs blkid findmnt mkswap mount mountpoint chroot \
 		   rsync wget tar unzip cpio env sha256sum eject halt reboot \
-		   btrfs mkfs.btrfs mkfs.ext4 numfmt
+		   btrfs mkfs.btrfs mkfs.ext4 numfmt e2fsck resize2fs \
+		   xfs_growfs resize.f2fs
 
 KICKSTART_PROGS_PATTERNS = \
 			   */lz4 \

features/kickstart/data/bin/kickstart-sh-storage

@@ -12,6 +12,11 @@ ks_devname()
 {
 	local devname=''
 	case "$1" in
+		/dev/root)
+			[ -n "$ROOT" ] || fatal "/dev/root is not defined"
+			ks_devname "$ROOT"
+			return
+			;;
 		LABEL=*)
 			devname="$(blkid -o device -L "${1#LABEL=}")"
 			;;
@@ -539,6 +544,60 @@ ks_get_dev_id()
 	printf '%s\n' "$1"
 }
 
+ks_requires_ext4=("e2fsck resize2fs")
+ks_requires_xfs=("xfs_growfs")
+ks_requires_f2fs=("resize.f2fs")
+ks_growfs()
+{
+       local PROG
+       local fs="" requires="" ret=0
+
+       PROG="kickstart"
+       message "command: ${FUNCNAME[0]} $*"
+
+       fs="$(blkid --output value --match-tag TYPE -c /dev/null "$1")" ||
+               return 0
+
+       case "$fs" in
+               ext*) requires="ks_growfs_ext4" ;;
+               xfs)  requires="ks_growfs_xfs"  ;;
+               f2fs) requires="ks_growfs_f2fs" ;;
+               *)
+                       # resize unsupported.
+                       return 0
+                       ;;
+       esac
+
+       ks_check_requires "$requires" ||
+               return 1
+
+       verbose "Increase filesystem to partition size: $1"
+
+       case "$fs" in
+               ext*)
+                       e2fsck -f "$1" && resize2fs "$1" ||
+                               ret=1
+                       ;;
+               xfs)
+                       mount -n -o rw,X-mount.mkdir \
+                               "$1" \
+                               "$ks_datadir/xfs.dir"
+                       xfs_growfs \
+                               "$ks_datadir/xfs.dir" ||
+                               ret=1
+                       umount -f \
+                               "$ks_datadir/xfs.dir"
+                        ;;
+               f2fs)
+                       resize.f2fs "$1" ||
+                               ret=1
+                       ;;
+       esac
+
+       return $ret
+}
+
+
 ks_requires_part=("numfmt" "sfdisk")
 part()
 {
@@ -820,14 +879,15 @@ part()
 		local partnum
 		read -r partnum < "/sys/class/block/$partdev/partition"
 
-		dev="$(readlink -ev "/sys/class/block/$partdev")"
+		dev="$(readlink-e "/sys/class/block/$partdev")"
 		dev="${dev%/*}"
 		dev="${dev##*/}"
 
 		verbose "increasing partition /dev/$dev$partnum"
 
 		printf ', %s\n' "$size" |
 			sfdisk -q -N "$partnum" "/dev/$dev"
+		ks_growfs "/dev/$dev$partnum"
 	fi
 
 	if [ -n "$encrypted" ]; then