[arch-releng] [archiso] [PATCH] Put pacman keyring into a tmpfs and make the rc.d initialization one-shot
This saves space in the cow file, especially in the case of persistent cow images. In the future, when porting to systemd, this should be implemented using a oneshot systemd service. --- configs/releng/root-image/etc/fstab | 6 ++++++ configs/releng/root-image/etc/rc.d/pacman-init | 6 ------ 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) create mode 100644 configs/releng/root-image/etc/fstab diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab new file mode 100644 index 0000000..9b14c80 --- /dev/null +++ b/configs/releng/root-image/etc/fstab @@ -0,0 +1,6 @@ +# +# /etc/fstab: static file system information +# +# <file system> <dir> <type> <options> <dump> <pass> +tmpfs /tmp tmpfs nodev,nosuid 0 0 +keyring /etc/pacman.d/gnupg tmpfs mode=0755 0 0 diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init index bbbd719..20005c8 100755 --- a/configs/releng/root-image/etc/rc.d/pacman-init +++ b/configs/releng/root-image/etc/rc.d/pacman-init @@ -7,7 +7,6 @@ case "$1" in start) stat_busy "Initializing pacman keyring" if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then - add_daemon pacman-init stat_done else stat_fail @@ -16,14 +15,9 @@ case "$1" in ;; stop) - stat_busy "Removing pacman keyring" - rm -rf /etc/pacman.d/gnupg - rm_daemon pacman-init - stat_done ;; restart) - $0 stop $0 start ;; -- 1.7.12
On 08/25/2012 10:07 AM, Thomas Bächler wrote:
This saves space in the cow file, especially in the case of persistent cow images. In the future, when porting to systemd, this should be implemented using a oneshot systemd service. --- configs/releng/root-image/etc/fstab | 6 ++++++ configs/releng/root-image/etc/rc.d/pacman-init | 6 ------ 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) create mode 100644 configs/releng/root-image/etc/fstab
diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab new file mode 100644 index 0000000..9b14c80 --- /dev/null +++ b/configs/releng/root-image/etc/fstab @@ -0,0 +1,6 @@ +# +# /etc/fstab: static file system information +# +# <file system> <dir> <type> <options> <dump> <pass> +tmpfs /tmp tmpfs nodev,nosuid 0 0 +keyring /etc/pacman.d/gnupg tmpfs mode=0755 0 0
Or maybe with tmpfiles.d d /run/pacman.d/gnupg - - - - - L - - - - /etc/pacman.d/gnupg
diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init index bbbd719..20005c8 100755 --- a/configs/releng/root-image/etc/rc.d/pacman-init +++ b/configs/releng/root-image/etc/rc.d/pacman-init @@ -7,7 +7,6 @@ case "$1" in start) stat_busy "Initializing pacman keyring" if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then - add_daemon pacman-init stat_done else stat_fail @@ -16,14 +15,9 @@ case "$1" in ;;
stop) - stat_busy "Removing pacman keyring" - rm -rf /etc/pacman.d/gnupg - rm_daemon pacman-init - stat_done ;;
restart) - $0 stop $0 start ;;
Well I was thinking in removing all initscripts stuff in few days, since there are no objections in my RFC patches. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Am 25.08.2012 18:02, schrieb Gerardo Exequiel Pozzi:
--- /dev/null +++ b/configs/releng/root-image/etc/fstab @@ -0,0 +1,6 @@ +# +# /etc/fstab: static file system information +# +# <file system> <dir> <type> <options> <dump> <pass> +tmpfs /tmp tmpfs nodev,nosuid 0 0 +keyring /etc/pacman.d/gnupg tmpfs mode=0755 0 0
Or maybe with tmpfiles.d
d /run/pacman.d/gnupg - - - - - L - - - - /etc/pacman.d/gnupg
Fine by me.
diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init index bbbd719..20005c8 100755 --- a/configs/releng/root-image/etc/rc.d/pacman-init +++ b/configs/releng/root-image/etc/rc.d/pacman-init @@ -7,7 +7,6 @@ case "$1" in start) stat_busy "Initializing pacman keyring" if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then - add_daemon pacman-init stat_done else stat_fail @@ -16,14 +15,9 @@ case "$1" in ;; stop) - stat_busy "Removing pacman keyring" - rm -rf /etc/pacman.d/gnupg - rm_daemon pacman-init - stat_done ;; restart) - $0 stop $0 start ;;
Well I was thinking in removing all initscripts stuff in few days, since there are no objections in my RFC patches.
Pierre had some concerns regarding the network setup, so I'll force him to comment on that by hitting him repeatedly until he writes an email. The same can be achieved with a oneshot systemd unit - what's important is that the pacman-init "stop" on shutdown makes no sense.
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler