diff options
author | Simon Rettberg | 2018-01-19 12:57:44 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-01-19 12:58:17 +0100 |
commit | a4dcf2f1cf51b2c920b007885e1a0da94ef41170 (patch) | |
tree | 536a1e9c8ee65b5827451a95e694e018eb3fb235 | |
parent | Fix UID/USER ambiguity in several places (diff) | |
download | mltk-a4dcf2f1cf51b2c920b007885e1a0da94ef41170.tar.gz mltk-a4dcf2f1cf51b2c920b007885e1a0da94ef41170.tar.xz mltk-a4dcf2f1cf51b2c920b007885e1a0da94ef41170.zip |
[vmchooser2] Default PVS to on if hybrid mode is enabled
References #3290
3 files changed, 13 insertions, 1 deletions
diff --git a/core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service b/core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service new file mode 120000 index 00000000..3a96d5a9 --- /dev/null +++ b/core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service @@ -0,0 +1 @@ +../sssd-resume-fix.service
\ No newline at end of file diff --git a/core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service b/core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service new file mode 100644 index 00000000..bad4e4be --- /dev/null +++ b/core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service @@ -0,0 +1,11 @@ +[Unit] +Description=Restart sssd after system resume to fix LDAP temporarily being unavailable +DefaultDependencies=no +After=systemd-suspend.service systemd-hybrid-sleep.service systemd-hibernate.service +RefuseManualStart=true + +[Service] +Type=oneshot +ExecStart=/opt/openslx/scripts/systemd-sssd_restart +RemainAfterExit=no + diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser index 39563322..b06443ae 100755 --- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -45,7 +45,7 @@ elif [ -n "$SLX_AUTOSTART_UUID" ]; then fi if [ -z "$SLX_NO_PVS" ]; then EXTRA="$EXTRA --pvs" - if [ "x$SLX_PVS_DEFAULT" = "xON" ]; then + if [ "x$SLX_PVS_DEFAULT" = "xON" ] || [ "x$SLX_PVS_HYBRID" = "xyes" ]; then EXTRA="$EXTRA --pvs-checked" fi fi |