On Wed, Sep 11, 2013 at 12:27 PM, Klaus Aehlig <[email protected]> wrote:
> Now that we have a machine readable description of the users > to be added to the system, use it to generate the tools/users-setup > script, so that we again have only one authoritative source of > the user and group requirements. This also has the advantage of > of avoiding duplicate additions and attemps add a user root. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > Makefile.am | 9 +++++++-- > tools/users-setup.in | 35 ----------------------------------- > 2 files changed, 7 insertions(+), 37 deletions(-) > delete mode 100644 tools/users-setup.in > > diff --git a/Makefile.am b/Makefile.am > index 2bfb1fe..f199456 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1378,8 +1378,13 @@ tools/kvm-ifup: tools/kvm-ifup.in$(REPLACE_VARS_SED) > sed -f $(REPLACE_VARS_SED) < $< > $@ > chmod +x $@ > > -tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED) > - sed -f $(REPLACE_VARS_SED) < $< > $@ > +tools/users-setup: Makefile $(userspecs) > + set -e; \ > + { echo '#!/bin/sh'; \ > + $(AWK) -- '{print "addgroup --system",$$1}' doc/users/groups; \ > + $(AWK) -- '{if (NF > 1) {print "adduser --system > --ingroup",$$2,$$1} else {print "adduser --system",$$1}}' doc/users/users; \ > + $(AWK) -- '{print "adduser",$$1,$$2}' > doc/users/groupmemberships; \ > + } > $@ > chmod +x $@ > > tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED) > diff --git a/tools/users-setup.in b/tools/users-setup.in > deleted file mode 100644 > index c9b5708..0000000 > --- a/tools/users-setup.in > +++ /dev/null > @@ -1,35 +0,0 @@ > -#!/bin/sh > -#Create common groups > -addgroup --system @GNTDAEMONSGROUP@ > -addgroup --system @GNTADMINGROUP@ > - > -#Create user-specific groups > -addgroup --system @GNTMASTERUSER@ > -addgroup --system @GNTRAPIUSER@ > -addgroup --system @GNTCONFDUSER@ > -addgroup --system @GNTLUXIDUSER@ > -addgroup --system @GNTMONDUSER@ > - > -#Create users > -adduser --system --ingroup @GNTMASTERDGROUP@ @GNTMASTERUSER@ > -adduser --system --ingroup @GNTRAPIGROUP@ @GNTRAPIUSER@ > -adduser --system --ingroup @GNTCONFDGROUP@ @GNTCONFDUSER@ > -adduser --system --ingroup @GNTLUXIDGROUP@ @GNTLUXIDUSER@ > -adduser --system --ingroup @GNTMONDGROUP@ @GNTMONDUSER@ > -adduser --system @GNTNODEDUSER@ > - > -#Add users to extra groups > -for u in @GNTMASTERUSER@ @GNTCONFDUSER@ @GNTLUXIDUSER@ > @GNTRAPIUSER@@GNTMONDUSER@ > -do > - adduser $u @GNTDAEMONSGROUP@ > -done > - > -for u in @GNTMASTERUSER@ @GNTRAPIUSER@ > -do > - adduser $u @GNTADMINGROUP@ > -done > - > -adduser @GNTMASTERUSER@ @GNTCONFDGROUP@ > -adduser @GNTMONDUSER@ @GNTMASTERDGROUP@ > -adduser @GNTLUXIDUSER@ @GNTMASTERDGROUP@ > -adduser @GNTLUXIDUSER@ @GNTCONFDGROUP@ > -- > 1.8.4 > > You are removing the tools/users-setup.in file. Shouldn't it be also removed from the EXTRA_DIST list in Makefile.am? Rest LGTM. Thanks, Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
