Merge branch 'preos' into 4.0-pre-not-stable

This commit is contained in:
Nico Schottelius 2014-06-13 16:29:29 +02:00
commit a1d78384f9

View file

@ -62,6 +62,8 @@ eof
# Steven found this out - coyping it 1:1
# fix the bloody 'stdin: is not a tty' problem
__line /root/.profile --line 'mesg n' --state absent
__hostname preos
"""
class PreOSExistsError(cdist.Error):