|
|
@ -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 <<EOF >/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 <<EOF >/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 |
|
|
|