diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-10-06 00:24:24 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-10-06 00:24:24 +0200 |
| commit | 76f275e993eec849bd7c03dc42504b6214774a85 (patch) | |
| tree | a30b492a2bd30c6cfc37dbd95f1d79c3cbe66ad7 | |
| parent | 39bf4183d11fa2443176c948b9a86297ff0cb50f (diff) | |
| download | archiso32-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>
5 files changed, 10 insertions, 3 deletions
diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 9445498..5b94743 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -35,7 +35,6 @@ _mnt_fs() { _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/archiso/used_block_devices - echo "/dev/mapper/${dm_snap_name} ${mnt} auto defaults 0 0" >> ${newroot}/etc/fstab } # args: /path/to/image_file, mountpoint 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 |