[Toybox] [PATCH] Remove FIFREEZE probe.

[enh via Toybox]

This has been around since 2008, so there doesn't seem much value to a
build-time probe in 2022.
---
 scripts/genconfig.sh  | 7 -------
 toys/other/fsfreeze.c | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

From 002a16f8809075c77cacb7407367833433f83dfc Mon Sep 17 00:00:00 2001
From: Elliott Hughes <e...@google.com>
Date: Tue, 14 Jun 2022 18:55:05 -0700
Subject: [PATCH] Remove FIFREEZE probe.

This has been around since 2008, so there doesn't seem much value to a
build-time probe in 2022.
---
 scripts/genconfig.sh  | 7 -------
 toys/other/fsfreeze.c | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh
index f2be8653..1e97717f 100755
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -33,13 +33,6 @@ probeconfig()
     int main(int argc, char *argv[]){printf("%d", x+SYS_unshare+ SYS_setns);}
 EOF
 
-  probesymbol TOYBOX_FIFREEZE -c << EOF
-    #include <linux/fs.h>
-    #ifndef FIFREEZE
-    #error nope
-    #endif
-EOF
-
   # Work around some uClibc limitations
   probesymbol TOYBOX_ICONV -c << EOF
     #include "iconv.h"
diff --git a/toys/other/fsfreeze.c b/toys/other/fsfreeze.c
index b494ce96..ee7bd530 100644
--- a/toys/other/fsfreeze.c
+++ b/toys/other/fsfreeze.c
@@ -7,7 +7,6 @@ USE_FSFREEZE(NEWTOY(fsfreeze, "<1>1f|u|[!fu]", TOYFLAG_USR|TOYFLAG_SBIN))
 config FSFREEZE
   bool "fsfreeze"
   default y
-  depends on TOYBOX_FIFREEZE
   help
     usage: fsfreeze {-f | -u} MOUNTPOINT
 
@@ -26,6 +25,6 @@ void fsfreeze_main(void)
   int fd = xopenro(*toys.optargs); 
   long p = 1;
 
-  xioctl(fd, (toys.optflags & FLAG_f) ? FIFREEZE : FITHAW, &p);
+  xioctl(fd, FLAG(f) ? FIFREEZE : FITHAW, &p);
   xclose(fd);
 }
-- 
2.36.1.476.g0c4daa206d-goog


_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net