summaryrefslogtreecommitdiff
path: root/src/instance/s6-instance-maker.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-01-31 12:06:01 +0000
committerLaurent Bercot <ska@appnovation.com>2023-01-31 12:06:01 +0000
commit80d231165357cf0d57b23dfe3b0aa16c7cb79545 (patch)
tree6f24601042b3088ff89a6f34788db6406806be00 /src/instance/s6-instance-maker.c
parentae972753206764373d4bce367e642eb31f0df68c (diff)
downloads6-80d231165357cf0d57b23dfe3b0aa16c7cb79545.tar.xz
Prepare for 2.11.2.1, move template location, change file list
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/instance/s6-instance-maker.c')
-rw-r--r--src/instance/s6-instance-maker.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/instance/s6-instance-maker.c b/src/instance/s6-instance-maker.c
index 8a82157..fcb67ac 100644
--- a/src/instance/s6-instance-maker.c
+++ b/src/instance/s6-instance-maker.c
@@ -62,7 +62,7 @@ static void write_service (char const *dir, char const *template, char const *us
svinfo data = { .user = user, .maxinstances = maxinstances } ;
size_t dirlen = strlen(dir) ;
mode_t m ;
- char fn[dirlen + 21] ;
+ char fn[dirlen + 11] ;
s6_auto_write_service(dir, 3, &write_run, &data, logger) ;
memcpy(fn, dir, dirlen) ;
memcpy(fn + dirlen, "/instance", 10) ;
@@ -71,7 +71,7 @@ static void write_service (char const *dir, char const *template, char const *us
memcpy(fn + dirlen + 9, "s", 2) ;
if (mkdir(fn, 0755) == -1) strerr_diefu2sys(111, "mkdir ", fn) ;
umask(m) ;
- memcpy(fn + dirlen + 10, "/.template", 11) ;
+ memcpy(fn + dirlen, "/template", 10) ;
if (!hiercopy_tmp(template, fn, &sa))
strerr_diefu4sys(111, "copy file hierarchy from ", template, " to ", fn) ;
}