libdevuansdk

commit fa3c7ea707e6a740b8a98f4eb671483104e26e88
parent e94ba2a34d68ea62313365a537dc34130f7cb7fe
Author: parazyd <parazyd@dyne.org>
Date:   Tue, 13 Mar 2018 12:36:17 +0100

Fixes to zlibs/vm to reflect others.

Diffstat:
M
zlibs/sysconf
 | 
4
+---
M
zlibs/vm
 | 
8
++++----

2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/zlibs/sysconf b/zlibs/sysconf
@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-# Copyright (c) 2016-2017 Dyne.org Foundation
+# Copyright (c) 2016-2018 Dyne.org Foundation
 # libdevuansdk is maintained by Ivan J. <parazyd@dyne.org>
 #
 # This file is part of libdevuansdk
@@ -33,8 +33,6 @@ conf_print_fstab() {
 	[[ -n "$livesdk_version" ]] && return
 	cat <<EOF
 #<file system>  <mount point>  <type>  <options>            <dump> <pass>
-# rootfs
-/dev/sda2       /              ext4    errors=remount-ro      0      1
 EOF
 }
 
diff --git a/zlibs/vm b/zlibs/vm
@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-# Copyright (c) 2016-2017 Dyne.org Foundation
+# Copyright (c) 2016-2018 Dyne.org Foundation
 # libdevuansdk is maintained by Ivan J. <parazyd@dyne.org>
 #
 # This file is part of libdevuansdk
@@ -31,7 +31,7 @@ vm_inject_overrides() {
 #!/bin/sh
 # rc.local for base images
 
-[ -f /etc/ssh/ssh_host_rsa_key.pub ] || dpkg-reconfigure openssh-server
+[ -f /etc/ssh/ssh_host_rsa_key.pub ] || ssh-keygen -A
 
 exit 0
 EOF
@@ -40,8 +40,8 @@ EOF
 	print "rootfs / rootfs rw 0 0" | sudo tee ${strapdir}/etc/fstab >/dev/null
 
 	sudo sed -i ${strapdir}/etc/ssh/sshd_config \
-		-e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' \
-		-e 's/PermitRootLogin without-password/PermitRootLogin yes/'|| zerr
+		-e 's/#PermitRootLogin .*/PermitRootLogin yes/' \
+		-e 's/PermitRootLogin .*/PermitRootLogin yes/'|| zerr
 }
 
 vm_setup_grub() {