Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Enhancement] debian/conffiles will give prompt if file existing when installing , need a way to supress prompt #323

Merged
merged 1 commit into from
Dec 13, 2019
Merged

[Enhancement] debian/conffiles will give prompt if file existing when installing , need a way to supress prompt #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions common/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ EXTRA_DIST = \
consumer_table_pops.lua \
producer_state_table_apply_view.lua \
table_dump.lua \
fdb_flush.lua \
database_config.json
fdb_flush.lua

EXTRA_CONF_DIST = database_config.json

swssdir = $(datadir)/swss
swsscommondir = /var/run/redis/sonic-db

dist_swss_DATA = $(EXTRA_DIST)
dist_swsscommon_DATA = $(EXTRA_CONF_DIST)

bin_PROGRAMS = swssloglevel

Expand Down
1 change: 1 addition & 0 deletions debian/conffiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/var/run/redis/sonic-db/database_config.json
2 changes: 1 addition & 1 deletion debian/libswsscommon.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
usr/lib/*/lib*.so.*
usr/share/swss/*.lua
usr/share/swss/*.json
var/run/redis/sonic-db/database_config.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var run usually hold running states, not configuration. why not /etc/sonic/redis/sonic-db/database_config.json.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me try to clarify the reason:
It is the database docker's responsibility to read startup configuration, and generate running configuration. All the downstream components read the "running configuration", and this one is an example.

usr/bin/swssloglevel
11 changes: 0 additions & 11 deletions debian/postinst
View file
Open in desktop

This file was deleted.