diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 58be215f8..3c318df51 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fstools -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_SOURCE_DATE:=2018-12-28 -PKG_SOURCE_VERSION:=af93f4b8dc32cf1320dfe8f4b93bb3a12606fc33 -PKG_MIRROR_HASH:=a2d8c2500fe75014ef16c039d8cdb276c1d5c066f8bce6550a3ecf46a9a411a9 +PKG_SOURCE_DATE:=2019-03-28 +PKG_SOURCE_VERSION:=ff1ded63c51e84e239fb422ac8b9d15251d1221f +PKG_MIRROR_HASH:=2731bbca42c0eafda557d545ebeca243fa4048c433c3b27d31256aca356886bc CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -110,6 +110,7 @@ define Package/block-mount/install $(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab $(INSTALL_CONF) ./files/fstab.default $(1)/etc/uci-defaults/10-fstab $(INSTALL_CONF) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount + $(INSTALL_CONF) ./files/media-change.hotplug $(1)/etc/hotplug.d/block/00-media-change $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/ diff --git a/package/system/fstools/files/media-change.hotplug b/package/system/fstools/files/media-change.hotplug new file mode 100644 index 000000000..30fc3d5c4 --- /dev/null +++ b/package/system/fstools/files/media-change.hotplug @@ -0,0 +1,8 @@ +[ -n "$DISK_MEDIA_CHANGE" ] && /sbin/block info + +if [ "$ACTION" = "add" -a "$DEVTYPE" = "disk" ]; then + case "$DEVNAME" in + mtd*) : ;; + *) echo 2000 > /sys/block/$DEVNAME/events_poll_msecs ;; + esac +fi diff --git a/package/system/fstools/patches/100-disable-lazy-init.patch b/package/system/fstools/patches/100-disable-lazy-init.patch new file mode 100644 index 000000000..c30925703 --- /dev/null +++ b/package/system/fstools/patches/100-disable-lazy-init.patch @@ -0,0 +1,13 @@ +diff --git a/libfstools/rootdisk.c b/libfstools/rootdisk.c +index dd00c1b..f3b87fc 100644 +--- a/libfstools/rootdisk.c ++++ b/libfstools/rootdisk.c +@@ -270,7 +270,7 @@ static int rootdisk_volume_init(struct volume *v) + if (rootdisk_use_f2fs(p)) + snprintf(str, sizeof(str), "mkfs.f2fs -q -l rootfs_data %s", v->blk); + else +- snprintf(str, sizeof(str), "mkfs.ext4 -q -L rootfs_data %s", v->blk); ++ snprintf(str, sizeof(str), "mkfs.ext4 -q -E lazy_itable_init=0,lazy_journal_init=0 -L rootfs_data %s", v->blk); + ret = system(str); + break; + default: