Merge branch 'no-haveged' into dev

Hayao0819 · Hayao0819 · commit 3071876dc17b · 2021-07-17T09:51:39.000+09:00
diff --git a/channels/releng/airootfs.any/etc/systemd/system/pacman-init.service b/channels/releng/airootfs.any/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.any/etc/systemd/system/pacman-init.service b/modules/share/airootfs.any/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.i486/etc/systemd/system/pacman-init.service b/modules/share/airootfs.i486/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.i686/etc/systemd/system/pacman-init.service b/modules/share/airootfs.i686/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.x86_64/etc/systemd/system/pacman-init.service b/modules/share/airootfs.x86_64/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/packages.i486/base.i486 b/modules/share/packages.i486/base.i486
@@ -12,7 +12,7 @@
 base-devel
 
 bash
-haveged
+#haveged
 intel-ucode
 amd-ucode
 mkinitcpio-nfs-utils
diff --git a/modules/share/packages.i686/base.i686 b/modules/share/packages.i686/base.i686
@@ -12,7 +12,7 @@
 base-devel
 
 bash
-haveged
+#haveged
 intel-ucode
 amd-ucode
 mkinitcpio-nfs-utils
diff --git a/modules/share/packages.x86_64/base.x86_64 b/modules/share/packages.x86_64/base.x86_64
@@ -12,7 +12,7 @@
 base-devel
 
 bash
-haveged
+#haveged
 intel-ucode
 amd-ucode
 mkinitcpio-nfs-utils
