From c43fdf45deede54a60cb3ba9ecc8d94ee4943069 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 21 Feb 2021 18:54:20 -0300 Subject: sync with archiso 652ad4d (HEAD -> master, origin/master, origin/HEAD) releng: Add usbmuxd to list of packages 03ac49f Remove haveged 97f510d .gitlab-ci.yml: use correct units for image size description Signed-off-by: David P --- configs/lxde-openrc/packages.both | 2 +- configs/releng-openrc/packages.both | 2 +- configs/releng/airootfs/etc/systemd/system/pacman-init.service | 2 -- configs/releng/packages.both | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both index d911619..b22be40 100644 --- a/configs/lxde-openrc/packages.both +++ b/configs/lxde-openrc/packages.both @@ -27,7 +27,6 @@ gpart gpm-openrc gptfdisk grml-zsh-config -haveged-openrc hdparm-openrc irssi iwd @@ -85,6 +84,7 @@ testdisk tmux udev-init-scripts usb_modeswitch +usbmuxd usbutils vim vpnc diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index c55658a..558caad 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -26,7 +26,6 @@ gpart gpm-openrc gptfdisk grml-zsh-config -haveged-openrc hdparm-openrc irssi iwd @@ -84,6 +83,7 @@ testdisk tmux udev-init-scripts usb_modeswitch +usbmuxd usbutils vim vpnc diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 6e9b84d..28d4398 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -3,8 +3,6 @@ [Unit] Description=Initializes Pacman keyring -Wants=haveged.service -After=haveged.service Requires=etc-pacman.d-gnupg.mount After=etc-pacman.d-gnupg.mount diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 3d41dfb..50b5c93 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -28,7 +28,6 @@ gpart gpm gptfdisk grml-zsh-config -haveged hdparm irssi iwd @@ -86,6 +85,7 @@ testdisk tmux udftools usb_modeswitch +usbmuxd usbutils vim vpnc -- cgit v1.2.2