From a89efcf1ad19919930126100cdc26aa270ca5df6 Mon Sep 17 00:00:00 2001 From: crims0n Date: Mon, 1 Feb 2021 09:00:02 +0300 Subject: [PATCH] update --- linux-live/minioslib | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/linux-live/minioslib b/linux-live/minioslib index da1a095..ca6c286 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -718,7 +718,6 @@ function build_live() { #(cd /linux-live/rootcopy && cp --parents -afr * /) - chroot $BUILD_DIR mount none -t proc /proc chroot $BUILD_DIR /linux-live/initrfs chroot $BUILD_DIR umount /proc @@ -1292,9 +1291,9 @@ if [ -f /etc/systemd/system/multi-user.target.wants/grub-initrd-fallback.service fi EOF -if grep openssh-server $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep openssh-server $SCRIPT_DIR/pkglists/other.list >>$OUTPUT 2>&1; then - echo "Enable ssh.service autostart." >>$OUTPUT 2>&1 - cat </lib/systemd/system/ssh-keygen.service + if grep openssh-server $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep openssh-server $SCRIPT_DIR/pkglists/other.list >>$OUTPUT 2>&1; then + echo "Enable ssh.service autostart." >>$OUTPUT 2>&1 + cat </lib/systemd/system/ssh-keygen.service [Unit] Description=Generate sshd keys Before=ssh.service @@ -1308,9 +1307,9 @@ StandardOutput=journal [Install] WantedBy=multi-user.target EOF - systemctl enable ssh-keygen >>$OUTPUT 2>&1 - systemctl enable ssh >>$OUTPUT 2>&1 - fi + systemctl enable ssh-keygen >>$OUTPUT 2>&1 + systemctl enable ssh >>$OUTPUT 2>&1 + fi elif [ $LIVE_TYPE = "casper" ]; then (cd /linux-live/rootcopy-casper && cp --parents -afr * /) fi