Completed support for preinstalled VM

Signed-off-by: Andreas Florath <andreas@florath.net>
florath · May 13, 2017 · 049b7d0 · 049b7d0
1 parent f74b940
commit 049b7d0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/contrib/vmsetup/Readme-PreinstalledVM.rst b/contrib/vmsetup/Readme-PreinstalledVM.rst
@@ -168,6 +168,14 @@ and add the line
 
    (load-file "/usr/local/pkg/rmtoo/rmtoo/contrib/req-mode.el")
 
+If your internet connection is not that fast, you can use the emacs
+directly in the console.  To enable this, always use the ``-nw``
+option to emacs, also e.g.:
+
+.. code:: bash
+
+   emacs -nw ~/.emacs
+
 Use Cases
 =========
 

diff --git a/contrib/vmsetup/dib-elements/rmtoo-small/install.d/50-install-rmtoo b/contrib/vmsetup/dib-elements/rmtoo-small/install.d/50-install-rmtoo
@@ -56,11 +56,13 @@ EOF
 
 DEFAULT_USERNAME=debian
 
-chsh --shell /bin/bash ${DEFAULT_USERNAME} || true
+sed -i -e "s|DSHELL=.*|DSHELL=/bin/bash|g" /etc/adduser.conf
+useradd -D --shell /bin/bash
 
 # Also set a passwordless sudo
 cat > /etc/sudoers.d/${DEFAULT_USERNAME} << EOF
 ${DEFAULT_USERNAME} ALL=(ALL) NOPASSWD:ALL
 EOF
 chmod 0440 /etc/sudoers.d/${DEFAULT_USERNAME}
 visudo -c || rm /etc/sudoers.d/${DEFAULT_USERNAME}
+
diff --git a/doc/release_notes/24.rst b/doc/release_notes/24.rst
@@ -12,6 +12,15 @@ IF YOU WANT TO USE THE NEW FEATURES, PLEASE FIRST READ THE
 DOCUMENTATION (rmtoo-config3(5)).  IF YOU HAVE PROBLEMS WITH THIS
 FEEL FREE TO CONTACT OUR SUPPORT AT rmtoo@florath.net
 
+24.2.0
+======
+
+User visible changes
+--------------------
+
+* Support for preinstalled virtual machines
+
+
 24.1.5
 ======
 

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from setuptools import setup
 
 PACKAGE = 'rmtoo'
-VERSION = '24.1.5'
+VERSION = '24.2.0'
 
 ADD_DATA = []