faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use tmpfs for /etc/pacman.d/gnupg instead of a symlink to /run

Browse Source 
This fixes FS#31815

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
Pierre Schmitz 2012-10-06 00:24:24 +02:00
parent 39bf4183d1
commit 76f275e993
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiso/initcpio/hooks/archiso
View File

@ -35,7 +35,6 @@ _mnt_fs() {
_mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w"
echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/archiso/used_block_devices 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 # args: /path/to/image_file, mountpoint

0
configs/releng/root-image/etc/fstab Normal file
View File

8
configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount Normal file
View File

@ -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

2
configs/releng/root-image/etc/systemd/system/pacman-init.service
View File

@ -2,6 +2,8 @@
Description=Initializes Pacman keyring Description=Initializes Pacman keyring
Wants=haveged.service Wants=haveged.service
After=haveged.service After=haveged.service
Requires=etc-pacman.d-gnupg.mount
After=etc-pacman.d-gnupg.mount
[Service] [Service]
Type=oneshot Type=oneshot

2
configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf
View File

@ -1,2 +0,0 @@
d /run/pacman.d/gnupg - - - - -
L /etc/pacman.d/gnupg - - - - /run/pacman.d/gnupg