diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-11-03 16:28:27 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-11-03 16:28:27 +1300 |
| commit | 80e4edb3cab104b1c70fda7336a725fee97ec7f0 (patch) | |
| tree | 4314b8b07d79ffdfdae6241e32b98bbbc47b5b7a | |
| parent | 452ff0c09406d3d26a79398011a33d22945ba1f9 (diff) | |
| download | lightdm-80e4edb3cab104b1c70fda7336a725fee97ec7f0.tar.gz | |
Change log backup to enabled by default - this is probably more useful. We explicitly disable in Ubuntu
| -rw-r--r-- | data/lightdm.conf | 2 | ||||
| -rw-r--r-- | debian/50-disable-log-backup.conf | 3 | ||||
| -rw-r--r-- | debian/lightdm.install | 1 | ||||
| -rw-r--r-- | src/lightdm.c | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/data/lightdm.conf b/data/lightdm.conf index e55ac175..d70001a1 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -32,7 +32,7 @@ #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions #remote-sessions-directory=/usr/share/lightdm/remote-sessions #greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters -#backup-logs=false +#backup-logs=true # # Seat configuration diff --git a/debian/50-disable-log-backup.conf b/debian/50-disable-log-backup.conf new file mode 100644 index 00000000..c96500f7 --- /dev/null +++ b/debian/50-disable-log-backup.conf @@ -0,0 +1,3 @@ +[LightDM] +# Disable log backup - we use logrotate instead +backup-logs=false diff --git a/debian/lightdm.install b/debian/lightdm.install index 01ce61ac..e126cef9 100644 --- a/debian/lightdm.install +++ b/debian/lightdm.install @@ -18,3 +18,4 @@ debian/source_lightdm.py usr/share/apport/package-hooks debian/50-xserver-command.conf usr/share/lightdm/lightdm.conf.d debian/50-greeter-wrapper.conf usr/share/lightdm/lightdm.conf.d debian/50-guest-wrapper.conf usr/share/lightdm/lightdm.conf.d +debian/50-disable-log-backup.conf usr/share/lightdm/lightdm.conf.d diff --git a/src/lightdm.c b/src/lightdm.c index a7e03056..b5f02d68 100644 --- a/src/lightdm.c +++ b/src/lightdm.c @@ -1373,6 +1373,8 @@ main (int argc, char **argv) config_set_string (config_get_instance (), "LightDM", "greeter-user", GREETER_USER); if (!config_has_key (config_get_instance (), "LightDM", "lock-memory")) config_set_boolean (config_get_instance (), "LightDM", "lock-memory", TRUE); + if (!config_has_key (config_get_instance (), "LightDM", "backup-logs")) + config_set_boolean (config_get_instance (), "LightDM", "backup-logs", TRUE); if (!config_has_key (config_get_instance (), "Seat:*", "type")) config_set_string (config_get_instance (), "Seat:*", "type", "xlocal"); if (!config_has_key (config_get_instance (), "Seat:*", "pam-service")) |