fix and rename tmpfiles.d removal patch.

diff --git a/srcpkgs/boot-66serv/patches/remove_tmpfiles.d_support.diff b/srcpkgs/boot-66serv/patches/0001-Remove-tmpfiles.d-support.patch
similarity index 66%
rename from srcpkgs/boot-66serv/patches/remove_tmpfiles.d_support.diff
rename to srcpkgs/boot-66serv/patches/0001-Remove-tmpfiles.d-support.patch
index 6ed257f..608e258 100644 (file)
--- a/srcpkgs/boot-66serv/patches/remove_tmpfiles.d_support.diff
+++ b/srcpkgs/boot-66serv/patches/0001-Remove-tmpfiles.d-support.patch
@@ -1,25 +1,42 @@
+From 002dd3aa63530b471ed2e36334b7250ba454c1cd Mon Sep 17 00:00:00 2001
+From: mobinmob <mobinmob@disroot.org>
+Date: Fri, 19 Nov 2021 19:14:37 +0200
+Subject: [PATCH] Remove tmpfiles.d support.
+
+---
+ Makefile                                  |  2 --
+ configure                                 |  6 +-----
+ doc/boot@.md                              |  4 ----
+ module/boot@/configure/configure          |  3 +--
+ module/boot@/service/all-Local            |  1 -
+ module/boot@/service/local/local-dmesg    |  1 -
+ module/boot@/service/local/local-tmpfiles | 23 -----------------------
+ service/boot@                             |  4 ----
+ 8 files changed, 2 insertions(+), 42 deletions(-)
+ delete mode 100644 module/boot@/service/local/local-tmpfiles
+
 diff --git a/Makefile b/Makefile
-index f137878ddd68d8da9c28bee8ec9df7d1165cb073..066d8d888755d442d8f7c28efb16e2c934a6faed 100644
+index f137878..066d8d8 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -56,7 +56,6 @@ $(DESTDIR)$(service_directory)/%: service/%
-        -e "s,@script_directory@,$(script_directory)," \
-        -e "s,@skel_directory@,$(skel_directory)," \
-        -e "s,@livedir@,$(livedir)," \
--       -e "s,@tmpfiles_path@,$(tmpfiles)," \
-        -e "s,@modules_path@,$(modules)," \
-        -e "s,@VERSION@,$(version)," \
-        -e "s,@HOSTNAME@,$(HOSTNAME)," \
+               -e "s,@script_directory@,$(script_directory)," \
+               -e "s,@skel_directory@,$(skel_directory)," \
+               -e "s,@livedir@,$(livedir)," \
+-              -e "s,@tmpfiles_path@,$(tmpfiles)," \
+               -e "s,@modules_path@,$(modules)," \
+               -e "s,@VERSION@,$(version)," \
+               -e "s,@HOSTNAME@,$(HOSTNAME)," \
 @@ -73,7 +72,6 @@ $(DESTDIR)$(service_directory)/%: service/%
-        -e "s,@FORCECHCK@,$(FORCECHCK)," \
-        -e "s,@LOCAL@,$(LOCAL)," \
-        -e "s,@CONTAINER@,$(CONTAINER)," \
--       -e "s,@TMPFILE@,$(TMPFILE)," \
-        -e "s,@MODULE_KERNEL@,$(MODULE_KERNEL)," \
-        -e "s,@MODULE_SYSTEM@,$(MODULE_SYSTEM)," \
-        -e "s,@RANDOMSEED@,$(RANDOMSEED)," \
+               -e "s,@FORCECHCK@,$(FORCECHCK)," \
+               -e "s,@LOCAL@,$(LOCAL)," \
+               -e "s,@CONTAINER@,$(CONTAINER)," \
+-              -e "s,@TMPFILE@,$(TMPFILE)," \
+               -e "s,@MODULE_KERNEL@,$(MODULE_KERNEL)," \
+               -e "s,@MODULE_SYSTEM@,$(MODULE_SYSTEM)," \
+               -e "s,@RANDOMSEED@,$(RANDOMSEED)," \
 diff --git a/configure b/configure
-index 9622be37e2d6414b0f7b3c3a034a9dce6f09bc19..2d26020df61da8b3dc3441db9a52c16cfa4d6363 100755
+index 9622be3..2d26020 100755
 --- a/configure
 +++ b/configure
 @@ -42,7 +42,6 @@ Fine tunning of boot configuration:
@@ -64,22 +81,22 @@ index 9622be37e2d6414b0f7b3c3a034a9dce6f09bc19..2d26020df61da8b3dc3441db9a52c16c
  $MODULE_SYSTEM
  $RANDOMSEED
 diff --git a/doc/boot@.md b/doc/boot@.md
-index 43f6480c6586a2afe141cc7e6b40e518574b4e45..a0b333e1fb06ca4551ff280b5afb226490675569 100644
+index 43f6480..a0b333e 100644
 --- a/doc/boot@.md
 +++ b/doc/boot@.md
 @@ -136,10 +136,6 @@ Two different kinds of variables are used:
-    - type: boolean.
-    - description: convenient variable used to boot inside a container. Some services will not work or be unnecessary when you boot inside a container. This variable provides you a safe default for this purpose. If set to yes the `HARDWARECLOCK`, `SETUPCONSOLE`, `KEYMAP`, `FONT`, `FONT_MAP`, `FONT_UNIMAP`, `CRYPTTAB`, `SWAP`, `LVM`, `DMRAID`, `BTRFS`, `ZFS`, `UDEV`, `SYSCTL`, `FORCECHCK`, `CGROUPS`, `MODULE_SYSTEM`, `RANDOMSEED`, `MNT_NETFS` variables have no effect.
+       - type: boolean.
+       - description: convenient variable used to boot inside a container. Some services will not work or be unnecessary when you boot inside a container. This variable provides you a safe default for this purpose. If set to yes the `HARDWARECLOCK`, `SETUPCONSOLE`, `KEYMAP`, `FONT`, `FONT_MAP`, `FONT_UNIMAP`, `CRYPTTAB`, `SWAP`, `LVM`, `DMRAID`, `BTRFS`, `ZFS`, `UDEV`, `SYSCTL`, `FORCECHCK`, `CGROUPS`, `MODULE_SYSTEM`, `RANDOMSEED`, `MNT_NETFS` variables have no effect.
  
 -- **TMPFILES**:
--   - type: boolean.
--   - description: read, parse and apply a systemd-style tmpfiles.d files usually found at `/usr/lib/tmpfiles.d` directory to handle volatile and temporary files.
+-      - type: boolean.
+-      - description: read, parse and apply a systemd-style tmpfiles.d files usually found at `/usr/lib/tmpfiles.d` directory to handle volatile and temporary files.
 -
  - **MODULE_KERNEL**:
-    - type: boolean.
-    - description: load the kernel modules returned by the `kmod static-nodes` command.
+       - type: boolean.
+       - description: load the kernel modules returned by the `kmod static-nodes` command.
 diff --git a/module/boot@/configure/configure b/module/boot@/configure/configure
-index e6fed96bddf9d2ada8bba10c450471a5bed654d6..18d27366d29cd5d850d4c261ce71aaab54f8ede8 100755
+index e6fed96..18d2736 100755
 --- a/module/boot@/configure/configure
 +++ b/module/boot@/configure/configure
 @@ -11,7 +11,7 @@ service_dir="${MOD_MODULE_DIR}/service"
@@ -100,7 +117,7 @@ index e6fed96bddf9d2ada8bba10c450471a5bed654d6..18d27366d29cd5d850d4c261ce71aaab
          MODULE_SYSTEM) SV_REAL="modules-system" ;;
          RANDOMSEED) SV_REAL="system-random" ;;
 diff --git a/module/boot@/service/all-Local b/module/boot@/service/all-Local
-index 95a2a1b37042aa5718e4f626e4b823057820fff9..2e08187f6838241a524ff79a97f888f22d25a662 100644
+index 95a2a1b..2e08187 100644
 --- a/module/boot@/service/all-Local
 +++ b/module/boot@/service/all-Local
 @@ -17,7 +17,6 @@ local-loop
@@ -112,7 +129,7 @@ index 95a2a1b37042aa5718e4f626e4b823057820fff9..2e08187f6838241a524ff79a97f888f2
  local-dmesg
  )
 diff --git a/module/boot@/service/local/local-dmesg b/module/boot@/service/local/local-dmesg
-index fe38ef4ba439197759780579326ed055a0cc1afb..ed87f7ee6f0595d037d1ed1c56c1f102ed663618 100644
+index fe38ef4..ed87f7e 100644
 --- a/module/boot@/service/local/local-dmesg
 +++ b/module/boot@/service/local/local-dmesg
 @@ -13,7 +13,6 @@ local-arptables
@@ -125,7 +142,7 @@ index fe38ef4ba439197759780579326ed055a0cc1afb..ed87f7ee6f0595d037d1ed1c56c1f102
  @user = ( root )
 diff --git a/module/boot@/service/local/local-tmpfiles b/module/boot@/service/local/local-tmpfiles
 deleted file mode 100644
-index 35a58e7281473d9ce808000c855bf448589b267e..0000000000000000000000000000000000000000
+index 35a58e7..0000000
 --- a/module/boot@/service/local/local-tmpfiles
 +++ /dev/null
 @@ -1,23 +0,0 @@
@@ -153,7 +170,7 @@ index 35a58e7281473d9ce808000c855bf448589b267e..00000000000000000000000000000000
 -script_file=!@tmpfiles@/opentmpfiles.sh
 -script_args=!--create --verbose --boot
 diff --git a/service/boot@ b/service/boot@
-index f08eac1d2f3d480ceffe41bb0b7890931d838607..da3e5e957d31deb8597279ecd72dbb268319d90a 100644
+index f08eac1..da3e5e9 100644
 --- a/service/boot@
 +++ b/service/boot@
 @@ -11,7 +11,6 @@
@@ -173,4 +190,7 @@ index f08eac1d2f3d480ceffe41bb0b7890931d838607..da3e5e957d31deb8597279ecd72dbb26
 -@TMPFILE@
  
  ## Load kernel modules [yes|no].
- 
\ No newline at end of file
+ 
+-- 
+2.34.0
+