summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-10-06 00:24:24 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-10-06 00:24:24 +0200
commit76f275e993eec849bd7c03dc42504b6214774a85 (patch)
treea30b492a2bd30c6cfc37dbd95f1d79c3cbe66ad7 /configs
parent39bf4183d11fa2443176c948b9a86297ff0cb50f (diff)
downloadarchiso32-76f275e993eec849bd7c03dc42504b6214774a85.tar.xz
Use tmpfs for /etc/pacman.d/gnupg instead of a symlink to /run
This fixes FS#31815 Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Diffstat (limited to 'configs')
-rw-r--r--configs/releng/root-image/etc/fstab0
-rw-r--r--configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount8
-rw-r--r--configs/releng/root-image/etc/systemd/system/pacman-init.service2
-rw-r--r--configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf2
4 files changed, 10 insertions, 2 deletions
diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/configs/releng/root-image/etc/fstab
diff --git a/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
new file mode 100644
index 0000000..4eab551
--- /dev/null
+++ b/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
@@ -0,0 +1,8 @@
+[Unit]
+Description=Temporary /etc/pacman.d/gnupg directory
+
+[Mount]
+What=tmpfs
+Where=/etc/pacman.d/gnupg
+Type=tmpfs
+Options=mode=0755
diff --git a/configs/releng/root-image/etc/systemd/system/pacman-init.service b/configs/releng/root-image/etc/systemd/system/pacman-init.service
index 2154476..23b8144 100644
--- a/configs/releng/root-image/etc/systemd/system/pacman-init.service
+++ b/configs/releng/root-image/etc/systemd/system/pacman-init.service
@@ -2,6 +2,8 @@
Description=Initializes Pacman keyring
Wants=haveged.service
After=haveged.service
+Requires=etc-pacman.d-gnupg.mount
+After=etc-pacman.d-gnupg.mount
[Service]
Type=oneshot
diff --git a/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf b/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf
deleted file mode 100644
index 8f3d6c9..0000000
--- a/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/pacman.d/gnupg - - - - -
-L /etc/pacman.d/gnupg - - - - /run/pacman.d/gnupg