[arch-releng] [RFC][PATCH 1/2] [archiso] Fix find cmd in _cleanup()
Fix FS#34075
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- archiso/mkarchiso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 4aca7fc..fa32b62 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -268,7 +268,7 @@ _cleanup () { find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete fi # Delete package pacman related files. - find "${work_dir}" -name "*.pacnew" -name "*.pacsave" -name "*.pacorig" -delete + find "${work_dir}" ( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" ) -delete _msg_info "Done!" }
Implements FS#34075.
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- configs/releng/root-image/etc/systemd/system/dhcpcd.service | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 configs/releng/root-image/etc/systemd/system/dhcpcd.service
diff --git a/configs/releng/root-image/etc/systemd/system/dhcpcd.service b/configs/releng/root-image/etc/systemd/system/dhcpcd.service deleted file mode 100644 index dd030d5..0000000 --- a/configs/releng/root-image/etc/systemd/system/dhcpcd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=dhcpcd on all interfaces -Wants=network.target -Before=network.target - -[Service] -Type=forking -PIDFile=/run/dhcpcd.pid -ExecStart=/sbin/dhcpcd -A -b -q -ExecStop=/sbin/dhcpcd -k - -[Install] -WantedBy=multi-user.target
participants (1)
-
Gerardo Exequiel Pozzi