diff options
| author | David P <megver83@parabola.nu> | 2020-07-15 11:05:30 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2020-07-15 11:05:30 -0400 |
| commit | f2d5583a9428f576a09023032a3e3bae95690b9a (patch) | |
| tree | 25a98b2aa34e32e52fa87f25961fdee396003fa8 /configs/releng/airootfs/root | |
| parent | ff1afc970853f1e9aac03e3fec8a3e2730920651 (diff) | |
[releng][baseline] sync with archiso and archiso32
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng/airootfs/root')
| -rwxr-xr-x | configs/releng/airootfs/root/.automated_script.sh | 4 | ||||
| -rwxr-xr-x | configs/releng/airootfs/root/customize_airootfs.sh | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/configs/releng/airootfs/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh index fb106da..0159a8f 100755 --- a/configs/releng/airootfs/root/.automated_script.sh +++ b/configs/releng/airootfs/root/.automated_script.sh @@ -15,8 +15,8 @@ automated_script () local script rt script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then - if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then - wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null + if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then + curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null rt=$? else cp "${script}" /tmp/startup_script diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index 2ebaa3b..dd8cefa 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -5,21 +5,13 @@ set -e -u sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen -ln -sf /usr/share/zoneinfo/UTC /etc/localtime - usermod -s /usr/bin/zsh root cp -aT /etc/skel/ /root/ chmod 700 /root +# unset the root password +passwd -d root sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf - -sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf -sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf -sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf - -systemctl enable multi-user.target pacman-init.service choose-mirror.service -systemctl set-default multi-user.target sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd |