40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2026-02-27 17:41:59 +01:00
Code Issues Releases Wiki Activity

Merge branch 'feature/16' of https://github.com/thomasleveil/baseimage-docker into thomasleveil-feature/16

Browse Source
This commit is contained in:
Hongli Lai (Phusion)
2014-02-25 10:30:30 +01:00
parent 3d5a46482f bf35ff2bf1
commit 139bc7b81e
5 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
image/my_init
View File

@@ -167,7 +167,14 @@ def wait_for_runit_services():
if not done:
time.sleep(0.1)
def install_insecure_key():
info("Installing insecure SSH key for user root")
run_command_killable("/usr/sbin/enable_insecure_key")
def main(args):
if args.enable_insecure_key:
install_insecure_key()
if not args.skip_startup_files:
run_startup_files()
@@ -217,6 +224,9 @@ parser.add_argument('--no-kill-all-on-exit', dest = 'kill_all_on_exit',
parser.add_argument('--quiet', dest = 'log_level',
action = 'store_const', const = LOG_LEVEL_WARN, default = LOG_LEVEL_INFO,
help = 'Only print warnings and errors')
parser.add_argument('--enable-insecure-key', dest = 'enable_insecure_key',
action = 'store_const', const = True, default = False,
help = 'Install the insecure SSH key')
args = parser.parse_args()
log_level = args.log_level