Merge branch 'master' into desktop

This commit is contained in:
Igor Pecovnik 2020-12-10 19:25:54 +01:00
commit 5e0040ec90
2 changed files with 5 additions and 1 deletions

View file

@ -130,11 +130,12 @@ install_common()
mkdir -p "${SDCARD}"/etc/systemd/system/getty@.service.d/
mkdir -p "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/
cat <<-EOF > "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf
[Unit]
After=graphical.target
[Service]
ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
ExecStart=
ExecStart=-/sbin/agetty --noissue --autologin root %I $TERM
After=graphical.target
Type=idle
EOF
cp "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf "${SDCARD}"/etc/systemd/system/getty@.service.d/override.conf

View file

@ -1268,6 +1268,9 @@ download_and_verify()
return
fi
# check if file exists on remote server before running aria2 downloader
[[ ! `wget -S --spider ${server}${remotedir}/${filename} 2>&1 | grep 'HTTP/1.1 200 OK'` ]] && return
cd "${localdir}" || exit
# use local control file