From 29cd8ae6fd58bd968958447e1438ff05a3bf4b48 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 10 Nov 2011 16:26:57 +1100 Subject: s4-provision permit server role to be the ROLE_ strings from s3 Also convert between the aliases in one single place. Andrew Bartlett Pair-Programmed-With: Amitay Isaacs --- source4/setup/provision | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source4/setup/provision') diff --git a/source4/setup/provision b/source4/setup/provision index 1d847decef..f4f6b10042 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -187,12 +187,7 @@ if not opts.adminpass: lp = sambaopts.get_loadparm() smbconf = lp.configfile -if opts.server_role == "dc": - server_role = "domain controller" -elif opts.server_role == "member": - server_role = "member server" -else: - server_role = opts.server_role +server_role = opts.server_role if server_role is None: server_role = "domain controller" -- cgit