Ticket #102 (closed defect: fixed)

Opened 2 years ago

Last modified 2 years ago

[regression] confman install is broken for singularities

Reported by: ccowart Owned by: blee
Priority: blocker Milestone: confman-1.9.3
Component: confman Version: HEAD
Keywords: Cc:

Description

It used to be valid to install the singularity without the suffix:

[2007] jayne etc % confman install rc.conf                     2009-11-11 16:43
Password:
At revision 168.
confman[71282]: ccowart: Installation operation started.
confman[71282]: ccowart: Installation operation succeeded.

And regardless of using the suffix, a complete file, not just the installed module,
used to be installed:

[2008] jayne etc % confman install rc.conf-foo                 2009-11-11 16:43
At revision 168.

Installing the rc.conf.
[...]
"/tmp/confman.RH3d99If/confman.7wKt0j1g" 3L, 100C written
confman[71500]: ccowart: Installation operation started.
Sending        rc.conf-foo
Transmitting file data .
Committed revision 169.
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /usr/home/ccowart/src/conf-test/foo/etc/rc.conf-foo /home/ccowart/img/etc/rc.conf-foo
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /tmp/confman.RH3d99If/confman.9vH1vvK9 /home/ccowart/img/etc/rc.conf
confman[71500]: ccowart: Installation operation succeeded.
[2009] jayne etc % cat /home/ccowart/img/etc/rc.conf           2009-11-11 16:43
# WARNING! This file is under confman revision control. DO NOT MODIFY DIRECTLY!
# Managed under foo module.
# $Id: rc.conf-foo 169 2009-11-12 00:43:51Z ccowart $

#apache22_enable="YES"
#More comments.

[2010] jayne etc % cat ../../core/etc/rc.conf-core             2009-11-11 16:44
# WARNING! This file is under confman revision control. DO NOT MODIFY DIRECTLY!
# Managed under core module.
# $Id: rc.conf-core 7 2008-09-12 08:02:55Z ccowart $

firewall_enable="YES"
firewall_script="/etc/ipfw.rules"
firewall_type="/etc/ipfw.rules"
firewall_flags="-p /bin/sh"

ntpd_enable="YES"
ntpd_sync_on_start="YES"
ntpd_flags="-p /var/run/ntpd.pid"

sshd_enable="YES"

Change History

comment:1 Changed 2 years ago by blee

  • Status changed from new to needsmerge

(In [495]) Fix the installation of singularities.

There are a few corresponding library function fixes for:

  • conf_livefile
  • conf_wfile_is_singularity

and a new library function, conf_wfile_module.

Fixes #102

comment:2 Changed 2 years ago by blee

  • Owner changed from confman-developers@… to blee
  • Status changed from needsmerge to accepted

comment:3 Changed 2 years ago by ccowart

12:00 <@ccowart> + for file in "$@"; do
12:00 <@ccowart> [...]
12:00 <@ccowart> + conf_install $layer "$args"
12:00 <@ccowart> will break when "$args" represents more than one file
12:00 <@ccowart> because the "" makes it a single shell word

I'm about to commit a fix for this.

comment:4 Changed 2 years ago by ccowart

(In [498]) Moving the call to conf_install_file up into the for loop
to overcome the shell quoting issue.

See #102

comment:5 Changed 2 years ago by ccowart

There's now a double-install:

[2095] jayne conf-test % confman install foo/etc/rc.conf-foo 2009-11-12 12:12
Password:
At revision 169.
confman[12475]: ccowart: Installation operation started.
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /usr/home/ccowart/src/conf-test/core/etc/rc.conf-core /home/ccowart/img/etc/rc.conf-core
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /usr/home/ccowart/src/conf-test/foo/etc/rc.conf-foo /home/ccowart/img/etc/rc.conf-foo
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /usr/home/ccowart/src/conf-test/foo/etc/rc.conf-foo /home/ccowart/img/etc/rc.conf-foo
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /usr/home/ccowart/src/conf-test/jayne/etc/rc.conf-jayne /home/ccowart/img/etc/rc.conf-jayne
/usr/local/bin/sudo install -Sp -o root -g wheel -m 0444 /tmp/confman.SKIcdDMt/confman.25MZijkt /home/ccowart/img/etc/rc.conf
confman[12475]: ccowart: Installation operation succeeded.

comment:6 Changed 2 years ago by blee

  • Status changed from accepted to needsmerge

(In [499]) Fix double installs

Fixes #102

comment:7 Changed 2 years ago by blee

  • Status changed from needsmerge to closed
  • Resolution set to fixed

(In [500]) Merge from trunk singularity fixes for confman install and
minor recipe creation fix.

Resolves #102, #103, #104

Note: See TracTickets for help on using tickets.