Bug #2739
closed
On rudder 2.4.0~beta3, the initial promises are located both in /opt/rudder/share/initial-promises/ and /opt/rudder/share/initial-promises/node-server/
Description
The initial-promises are in duplicate in /opt/rudder/share/initial-promises/ and /opt/rudder/share/initial-promises/node-server/ :
[root@centos-6-64 ~]# tree /opt/rudder/share/initial-promises/ /opt/rudder/share/initial-promises/ ├── common │ └── 1.0 │ ├── cfengine_stdlib.cf │ ├── cf-served.cf │ ├── internal_security.cf │ ├── process_matching.cf │ ├── rudder_lib.cf │ ├── site.cf │ └── update.cf ├── distributePolicy │ ├── 1.0 │ │ ├── aliveCheck.cf │ │ ├── initCheck.cf │ │ ├── integrityCheck.cf │ │ ├── logrotateCheck.cf │ │ ├── networkCheck.cf │ │ ├── passwordCheck.cf │ │ ├── postgresCheck.cf │ │ ├── propagatePromises.cf │ │ └── rsyslogConf.cf │ ├── logrotate.conf │ │ └── rudder │ └── rsyslog.conf │ └── rudder.conf ├── failsafe.cf ├── inventory │ └── 1.0 │ ├── fetchFusionTools.cf │ ├── fusionAgent.cf │ └── virtualMachines.cf ├── node-server │ [...] └── promises.cf 17 directories, 46 files
[root@centos-6-64 ~]# tree /opt/rudder/share/initial-promises/node-server/ /opt/rudder/share/initial-promises/node-server/ ├── common │ └── 1.0 │ ├── cfengine_stdlib.cf │ ├── cf-served.cf │ ├── internal_security.cf │ ├── process_matching.cf │ ├── rudder_lib.cf │ ├── site.cf │ └── update.cf ├── distributePolicy │ ├── 1.0 │ │ ├── aliveCheck.cf │ │ ├── initCheck.cf │ │ ├── integrityCheck.cf │ │ ├── logrotateCheck.cf │ │ ├── networkCheck.cf │ │ ├── passwordCheck.cf │ │ ├── postgresCheck.cf │ │ ├── propagatePromises.cf │ │ └── rsyslogConf.cf │ ├── logrotate.conf │ │ └── rudder │ └── rsyslog.conf │ └── rudder.conf ├── failsafe.cf ├── inventory │ └── 1.0 │ ├── fetchFusionTools.cf │ ├── fusionAgent.cf │ └── virtualMachines.cf └── promises.cf 8 directories, 23 files
Updated by Nicolas PERRON over 12 years ago
- Status changed from New to Pending technical review
- % Done changed from 0 to 100
Applied in changeset commit:df0ba66d294eeabe645c8511a0fbab85a8e0871a.
Updated by Matthieu CERDA over 12 years ago
Looks good to me. That was a perverted one !!!
Updated by Jonathan CLARKE over 12 years ago
- Target version changed from 2.4.0~beta3 to 2.4.0~beta5
This change will in no way fix the problem: if you cp -a or cp -r a directory to a target, cp will either create that target, or if it already exists, copy into that target directory.
The "-T" option to cp avoids this behaviour. I'm implementing a fix now.
Updated by Nicolas PERRON over 12 years ago
Jonathan CLARKE wrote:
This change will in no way fix the problem: if you cp -a or cp -r a directory to a target, cp will either create that target, or if it already exists, copy into that target directory.
The "-T" option to cp avoids this behaviour. I'm implementing a fix now.
I didn't know this option. This fix looks good to me.
Updated by Jonathan CLARKE over 12 years ago
- Status changed from Pending technical review to Released