From e56480cce18a5966d5e8b235b7285e4f3290f5c4 Mon Sep 17 00:00:00 2001 From: Jerry Date: Mon, 1 Mar 2021 13:03:20 +0800 Subject: [PATCH] arch ?? copying home to overlayfs might not be a good idea --- menhera.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/menhera.sh b/menhera.sh index eac82fc..3dfb3fa 100755 --- a/menhera.sh +++ b/menhera.sh @@ -5,7 +5,8 @@ set +h # config WORKDIR="/tmp/menhera" -ROOTFS="" +MIRROR="https://storage.meson.cc/archlinux" +ROOTFS="${MIRROR}/iso/latest/arch/x86_64/airootfs.sfs" declare -A ARCH_MAP=( ["x86_64"]="amd64" @@ -32,15 +33,15 @@ EOF menhera::__compat_restart_ssh() { if [ -x "$(command -v systemctl)" ]; then systemctl daemon-reload - if ! systemctl restart ssh; then + if ! systemctl restart sshd; then echo "SSH daemon start failed, try resetting config..." menhera::reset_sshd_config - if ! systemctl restart ssh; then + if ! systemctl restart sshd; then echo "SSH daemon fail to start, dropping you to a shell..." sh fi fi - elif [ -x "$(command -v service)" ]; then + elif false && [ -x "$(command -v service)" ]; then # there is no such thing in archlinux if ! service ssh restart; then echo "SSH daemon start failed, try resetting config..." menhera::reset_sshd_config @@ -83,15 +84,15 @@ menhera::confirm() { # jobs menhera::get_rootfs() { - if [ -n ${ROOTFS} ]; then + if [ -z "${ROOTFS}" ]; then echo "Getting rootfs URL..." # forgive me for parsing HTML with these shit # and hope it works ROOTFS_TIME=$(wget -qO- --show-progress "https://images.linuxcontainers.org/images/debian/buster/${ARCH_ID}/default/?C=M;O=D" | grep -oP '(\d{8}_\d{2}:\d{2})' | head -n 1) - + ROOTFS="https://images.linuxcontainers.org/images/debian/buster/${ARCH_ID}/default/${ROOTFS_TIME}/rootfs.squashfs" - else + else echo "\$ROOTFS is set to '$ROOTFS'" fi } @@ -136,6 +137,7 @@ menhera::mount_new_rootfs() { } menhera::install_software() { + return echo "Installing OpenSSH Server into new rootfs..." # disable APT cache