aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-08-28 12:26:53 +0200
committerJo-Philipp Wich <jo@mein.io>2019-08-28 12:48:45 +0200
commitee164007b0d765f22cdc6df4903e7b6249bf477d (patch)
tree2257d65da333e6ffbf2010ad46523ae004f996e3
parentf2c6fa3dbb55ddd5a2aa1080fd86cfc081d29949 (diff)
downloadupstream-ee164007b0d765f22cdc6df4903e7b6249bf477d.tar.gz
upstream-ee164007b0d765f22cdc6df4903e7b6249bf477d.tar.bz2
upstream-ee164007b0d765f22cdc6df4903e7b6249bf477d.zip
fstools: update to latest Git HEAD
6a61b9a probe: fallback to libblkid.so.1 when libblkid.so does not exist Also remove deprecation notices from init script while we're at it. Fixes: FS#2274 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 517cb0b70bebdc283965c7873521f7bf9b4fe736)
-rw-r--r--package/system/fstools/Makefile6
-rw-r--r--package/system/fstools/files/fstab.init4
2 files changed, 5 insertions, 5 deletions
diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index e26fb09818..c8961b3354 100644
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
-PKG_SOURCE_DATE:=2019-07-01
-PKG_SOURCE_VERSION:=1539b535ac327a3bc599d1ca871e14fd0dc3bba1
-PKG_MIRROR_HASH:=97accec8224aa14e6ce95049483faed581eb5df07eab54ba33d92e9ddea339c0
+PKG_SOURCE_DATE:=2019-08-28
+PKG_SOURCE_VERSION:=6a61b9ac105b8eb28680e728a2723e302a91304d
+PKG_MIRROR_HASH:=f617d06ccea732fcbfdc2a2bd70c59726d37f61de100fae895d718884a9624d1
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0
diff --git a/package/system/fstools/files/fstab.init b/package/system/fstools/files/fstab.init
index afed78ebfc..08d5601bee 100644
--- a/package/system/fstools/files/fstab.init
+++ b/package/system/fstools/files/fstab.init
@@ -8,11 +8,11 @@ boot() {
}
start() {
- echo "this file has been obsoleted. please call \"/sbin/block mount\" directly"
+ return 0
}
restart() {
- start
+ return 0
}
stop() {