[arch-releng] [PATCH] Mostly revert d355c2b83527d3f0c08c6e800b975a613a169c9d

Thomas Bächler thomas at archlinux.org
Sat Oct 6 19:05:39 EDT 2012


The only valid part of this patch was the removal of haveged.service, the
rest was incorrect.

We should NOT override getty at .service with autologin at .service, instead
the autologin at .service is meant as a separate unit.

In contrast to the commit message, multi-user.target is not the default
default target and still has to be enabled.
---
 configs/releng/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 2699468..b78d2b0 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -183,7 +183,7 @@ make_customize_root_image() {
         patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch
         sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen
         sed 's#\(^ExecStart=-/sbin/agetty\)#\1 --autologin root#' \
-            ${work_dir}/root-image/usr/lib/systemd/system/getty at .service > ${work_dir}/root-image/etc/systemd/system/getty at .service
+            ${work_dir}/root-image/usr/lib/systemd/system/getty at .service > ${work_dir}/root-image/etc/systemd/system/autologin at .service
         mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \
             -r 'locale-gen' \
             run
@@ -194,7 +194,7 @@ make_customize_root_image() {
             -r 'useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /bin/zsh arch' \
             run
         mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \
-            -r 'systemctl -f enable pacman-init.service getty at .service dhcpcd.service || true' \
+            -r 'systemctl -f enable multi-user.target pacman-init.service autologin at .service dhcpcd.service || true' \
             run
         : > ${work_dir}/build.${FUNCNAME}
     fi
-- 
1.7.12.2



More information about the arch-releng mailing list