Skip to content

Commit 278813b

Browse files
psergeeLeonidVas
authored andcommitted
pack: fix conflicting dirs for RPM
There is an issue with installing packed RPM on CentOS7: conflicting systemd directoriies with systemd RPM. Skip adding these dirs to an RPM package.
1 parent 0e4fae6 commit 278813b

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

cli/pack/rpm_const.go

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,26 +91,28 @@ var (
9191

9292
systemDirs = map[string]struct{}{
9393
// in fact, all this dirs has leading '/'
94-
".": struct{}{},
95-
"bin": struct{}{},
96-
"usr": struct{}{},
97-
"usr/bin": struct{}{},
98-
"usr/local": struct{}{},
99-
"usr/local/bin": struct{}{},
100-
"usr/share": struct{}{},
101-
"usr/share/tarantool": struct{}{},
102-
"usr/lib": struct{}{},
103-
"usr/lib/tmpfiles.d": struct{}{},
104-
"var": struct{}{},
105-
"var/lib": struct{}{},
106-
"var/lib/tarantool": struct{}{},
107-
"var/run": struct{}{},
108-
"var/log": struct{}{},
109-
"etc": struct{}{},
110-
"etc/tarantool": struct{}{},
111-
"etc/tarantool/conf.d": struct{}{},
112-
"etc/systemd": struct{}{},
113-
"etc/systemd/system": struct{}{},
94+
".": struct{}{},
95+
"bin": struct{}{},
96+
"usr": struct{}{},
97+
"usr/bin": struct{}{},
98+
"usr/local": struct{}{},
99+
"usr/local/bin": struct{}{},
100+
"usr/share": struct{}{},
101+
"usr/share/tarantool": struct{}{},
102+
"usr/lib": struct{}{},
103+
"usr/lib/tmpfiles.d": struct{}{},
104+
"var": struct{}{},
105+
"var/lib": struct{}{},
106+
"var/lib/tarantool": struct{}{},
107+
"var/run": struct{}{},
108+
"var/log": struct{}{},
109+
"etc": struct{}{},
110+
"etc/tarantool": struct{}{},
111+
"etc/tarantool/conf.d": struct{}{},
112+
"etc/systemd": struct{}{},
113+
"etc/systemd/system": struct{}{},
114+
"usr/lib/systemd": struct{}{},
115+
"usr/lib/systemd/system": struct{}{},
114116
}
115117

116118
boundariesByType = map[rpmValueType]int{

0 commit comments

Comments
 (0)