diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | man/bcfg2.1 | 2 | ||||
| -rw-r--r-- | schemas/bundle.xsd | 1 | ||||
| -rwxr-xr-x | src/sbin/bcfg2 | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/control b/debian/control index df3b0eeb6..fd37543b3 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Description: build configuration system Package: bcfg2-server Architecture: all -Depends: ${python:Depends}, bcfg2, python-lxml (>= 0.8), python2.3-fam | python2.3-gamin, python-pyopenssl, libxml2-utils, fam | gamin +Depends: ${python:Depends}, bcfg2, python-lxml (>= 0.8), python-fam | python2.3-gamin | python2.4-gamin , python-pyopenssl, libxml2-utils, fam | gamin Description: build configuration system, version two Bcfg2 is a symbolic configuration management system, produced at Argonne National Lab. diff --git a/man/bcfg2.1 b/man/bcfg2.1 index c065c3afa..127e037a4 100644 --- a/man/bcfg2.1 +++ b/man/bcfg2.1 @@ -51,7 +51,7 @@ may still be in miniroot. .RE .B "\-r <mode>" .RS -Cause bcfg2 to remove extra configuration elements it detects. Mode is one of all, svcs, or pkgs. All removes all entries. Likewise, services and packages remove only the extra configuration elements of the respective type. +Cause bcfg2 to remove extra configuration elements it detects. Mode is one of all, services, or packages. All removes all entries. Likewise, services and packages remove only the extra configuration elements of the respective type. .RE .B "\-p <profile>" .RS diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index 391a5a27e..66fc6d9a7 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -18,6 +18,7 @@ <xsd:element name='SymLink' type='SymLinkType'/> <xsd:element name='Permissions' type='PermissionType'/> <xsd:element name='PostInstall' type='PostInstallType'/> + <xsd:element name='Group' type='GroupType'/> </xsd:choice> <xsd:attribute type='xsd:string' name='name' use='required'/> </xsd:complexType> diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 002dd6058..fc589c0ef 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -89,7 +89,7 @@ class Client: 'file': "<cache file>", 'cache': "<cache file>", 'profile': "<profile name>", - 'remove': "(pkgs | svcs | all)", + 'remove': "(packages | services | all)", 'setup': "<setup file>", 'server': '<hostname> ', 'user': '<user name> ', |