findutils: Create /var/lib/locale

Message ID 20211207153650.2455142-1-michael.tremer@ipfire.org
State Accepted
Headers
Series findutils: Create /var/lib/locale |

Commit Message

Michael Tremer Dec. 7, 2021, 3:36 p.m. UTC
  This is required for updatedb to store its data.

Fixes: #12670
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/aarch64/stage2 | 1 -
 config/rootfiles/common/armv6l/stage2  | 1 -
 config/rootfiles/common/findutils      | 1 +
 config/rootfiles/common/i586/stage2    | 1 -
 config/rootfiles/common/x86_64/stage2  | 1 -
 lfs/stage2                             | 2 +-
 6 files changed, 2 insertions(+), 5 deletions(-)
  

Comments

Michael Tremer Dec. 7, 2021, 3:37 p.m. UTC | #1
Never mind the typo in the subject line. It should of course be “locate”.

> On 7 Dec 2021, at 15:36, Michael Tremer <michael.tremer@ipfire.org> wrote:
> 
> This is required for updatedb to store its data.
> 
> Fixes: #12670
> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
> config/rootfiles/common/aarch64/stage2 | 1 -
> config/rootfiles/common/armv6l/stage2  | 1 -
> config/rootfiles/common/findutils      | 1 +
> config/rootfiles/common/i586/stage2    | 1 -
> config/rootfiles/common/x86_64/stage2  | 1 -
> lfs/stage2                             | 2 +-
> 6 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
> index 59d85aabc..521c815c0 100644
> --- a/config/rootfiles/common/aarch64/stage2
> +++ b/config/rootfiles/common/aarch64/stage2
> @@ -157,7 +157,6 @@ usr/share/doc/licenses/GPLv3
> #var/cache
> var/empty
> #var/lib
> -#var/lib/locate
> #var/lib/misc
> #var/local
> var/lock
> diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
> index 0645bb37d..5989bc9a9 100644
> --- a/config/rootfiles/common/armv6l/stage2
> +++ b/config/rootfiles/common/armv6l/stage2
> @@ -156,7 +156,6 @@ usr/share/doc/licenses/GPLv3
> #var/cache
> var/empty
> #var/lib
> -#var/lib/locate
> #var/lib/misc
> #var/local
> var/lock
> diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils
> index d9f9ad0b6..4f71f1600 100644
> --- a/config/rootfiles/common/findutils
> +++ b/config/rootfiles/common/findutils
> @@ -15,3 +15,4 @@ usr/lib/findutils/frcode
> #usr/share/man/man1/updatedb.1
> #usr/share/man/man1/xargs.1
> #usr/share/man/man5/locatedb.5
> +var/lib/locate
> diff --git a/config/rootfiles/common/i586/stage2 b/config/rootfiles/common/i586/stage2
> index 9d73bf9c3..2c9fef709 100644
> --- a/config/rootfiles/common/i586/stage2
> +++ b/config/rootfiles/common/i586/stage2
> @@ -156,7 +156,6 @@ usr/share/doc/licenses/GPLv3
> #var/cache
> var/empty
> #var/lib
> -#var/lib/locate
> #var/lib/misc
> #var/local
> var/lock
> diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
> index d0f013b1a..0d613f76a 100644
> --- a/config/rootfiles/common/x86_64/stage2
> +++ b/config/rootfiles/common/x86_64/stage2
> @@ -157,7 +157,6 @@ usr/share/doc/licenses/GPLv3
> #var/cache
> var/empty
> #var/lib
> -#var/lib/locate
> #var/lib/misc
> #var/local
> var/lock
> diff --git a/lfs/stage2 b/lfs/stage2
> index 9032b013e..daa98765e 100644
> --- a/lfs/stage2
> +++ b/lfs/stage2
> @@ -132,7 +132,7 @@ endif
> 
> 	# Create /var dirs and files
> 	-mkdir -v /var/{lock,log,mail,spool,empty}
> -	-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
> +	-mkdir -pv /var/{opt,cache,lib/{misc},local}
> 	-mkdir -pv /var/log/{counter,calamaris}
> 	chown nobody.nobody /var/log/calamaris
> 	touch /var/log/{btmp,lastlog,wtmp}
> -- 
> 2.30.2
>
  
Peter Müller Dec. 9, 2021, 7:27 p.m. UTC | #2
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> This is required for updatedb to store its data.
> 
> Fixes: #12670
> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>  config/rootfiles/common/aarch64/stage2 | 1 -
>  config/rootfiles/common/armv6l/stage2  | 1 -
>  config/rootfiles/common/findutils      | 1 +
>  config/rootfiles/common/i586/stage2    | 1 -
>  config/rootfiles/common/x86_64/stage2  | 1 -
>  lfs/stage2                             | 2 +-
>  6 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
> index 59d85aabc..521c815c0 100644
> --- a/config/rootfiles/common/aarch64/stage2
> +++ b/config/rootfiles/common/aarch64/stage2
> @@ -157,7 +157,6 @@ usr/share/doc/licenses/GPLv3
>  #var/cache
>  var/empty
>  #var/lib
> -#var/lib/locate
>  #var/lib/misc
>  #var/local
>  var/lock
> diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
> index 0645bb37d..5989bc9a9 100644
> --- a/config/rootfiles/common/armv6l/stage2
> +++ b/config/rootfiles/common/armv6l/stage2
> @@ -156,7 +156,6 @@ usr/share/doc/licenses/GPLv3
>  #var/cache
>  var/empty
>  #var/lib
> -#var/lib/locate
>  #var/lib/misc
>  #var/local
>  var/lock
> diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils
> index d9f9ad0b6..4f71f1600 100644
> --- a/config/rootfiles/common/findutils
> +++ b/config/rootfiles/common/findutils
> @@ -15,3 +15,4 @@ usr/lib/findutils/frcode
>  #usr/share/man/man1/updatedb.1
>  #usr/share/man/man1/xargs.1
>  #usr/share/man/man5/locatedb.5
> +var/lib/locate
> diff --git a/config/rootfiles/common/i586/stage2 b/config/rootfiles/common/i586/stage2
> index 9d73bf9c3..2c9fef709 100644
> --- a/config/rootfiles/common/i586/stage2
> +++ b/config/rootfiles/common/i586/stage2
> @@ -156,7 +156,6 @@ usr/share/doc/licenses/GPLv3
>  #var/cache
>  var/empty
>  #var/lib
> -#var/lib/locate
>  #var/lib/misc
>  #var/local
>  var/lock
> diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
> index d0f013b1a..0d613f76a 100644
> --- a/config/rootfiles/common/x86_64/stage2
> +++ b/config/rootfiles/common/x86_64/stage2
> @@ -157,7 +157,6 @@ usr/share/doc/licenses/GPLv3
>  #var/cache
>  var/empty
>  #var/lib
> -#var/lib/locate
>  #var/lib/misc
>  #var/local
>  var/lock
> diff --git a/lfs/stage2 b/lfs/stage2
> index 9032b013e..daa98765e 100644
> --- a/lfs/stage2
> +++ b/lfs/stage2
> @@ -132,7 +132,7 @@ endif
>  
>  	# Create /var dirs and files
>  	-mkdir -v /var/{lock,log,mail,spool,empty}
> -	-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
> +	-mkdir -pv /var/{opt,cache,lib/{misc},local}
>  	-mkdir -pv /var/log/{counter,calamaris}
>  	chown nobody.nobody /var/log/calamaris
>  	touch /var/log/{btmp,lastlog,wtmp}
>
  

Patch

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 59d85aabc..521c815c0 100644
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -157,7 +157,6 @@  usr/share/doc/licenses/GPLv3
 #var/cache
 var/empty
 #var/lib
-#var/lib/locate
 #var/lib/misc
 #var/local
 var/lock
diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
index 0645bb37d..5989bc9a9 100644
--- a/config/rootfiles/common/armv6l/stage2
+++ b/config/rootfiles/common/armv6l/stage2
@@ -156,7 +156,6 @@  usr/share/doc/licenses/GPLv3
 #var/cache
 var/empty
 #var/lib
-#var/lib/locate
 #var/lib/misc
 #var/local
 var/lock
diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils
index d9f9ad0b6..4f71f1600 100644
--- a/config/rootfiles/common/findutils
+++ b/config/rootfiles/common/findutils
@@ -15,3 +15,4 @@  usr/lib/findutils/frcode
 #usr/share/man/man1/updatedb.1
 #usr/share/man/man1/xargs.1
 #usr/share/man/man5/locatedb.5
+var/lib/locate
diff --git a/config/rootfiles/common/i586/stage2 b/config/rootfiles/common/i586/stage2
index 9d73bf9c3..2c9fef709 100644
--- a/config/rootfiles/common/i586/stage2
+++ b/config/rootfiles/common/i586/stage2
@@ -156,7 +156,6 @@  usr/share/doc/licenses/GPLv3
 #var/cache
 var/empty
 #var/lib
-#var/lib/locate
 #var/lib/misc
 #var/local
 var/lock
diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index d0f013b1a..0d613f76a 100644
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -157,7 +157,6 @@  usr/share/doc/licenses/GPLv3
 #var/cache
 var/empty
 #var/lib
-#var/lib/locate
 #var/lib/misc
 #var/local
 var/lock
diff --git a/lfs/stage2 b/lfs/stage2
index 9032b013e..daa98765e 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -132,7 +132,7 @@  endif
 
 	# Create /var dirs and files
 	-mkdir -v /var/{lock,log,mail,spool,empty}
-	-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
+	-mkdir -pv /var/{opt,cache,lib/{misc},local}
 	-mkdir -pv /var/log/{counter,calamaris}
 	chown nobody.nobody /var/log/calamaris
 	touch /var/log/{btmp,lastlog,wtmp}