summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/Property/LightDM.hs3
3 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 34ea28f4..743667a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (4.0.7) UNRELEASED; urgency=medium
+propellor (4.1.0) UNRELEASED; urgency=medium
* User.hasInsecurePassword makes sure shadow passwords are enabled,
so if the insecure password is later changed, the new password won't be
@@ -16,6 +16,8 @@ propellor (4.0.7) UNRELEASED; urgency=medium
chroot.
* When provisioning a container, output was buffered until the whole
process was done; now output will be displayed immediately.
+ * LightDM.autoLogin: Make it require LightDM.installed.
+ (minor API change as the type changed)
-- Joey Hess <id@joeyh.name> Tue, 20 Jun 2017 10:55:37 -0400
diff --git a/propellor.cabal b/propellor.cabal
index 09548f90..abf5f05b 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 4.0.6
+Version: 4.1.0
Cabal-Version: >= 1.20
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>
diff --git a/src/Propellor/Property/LightDM.hs b/src/Propellor/Property/LightDM.hs
index 339fa9a3..69538d89 100644
--- a/src/Propellor/Property/LightDM.hs
+++ b/src/Propellor/Property/LightDM.hs
@@ -10,7 +10,8 @@ installed :: Property DebianLike
installed = Apt.installed ["lightdm"]
-- | Configures LightDM to skip the login screen and autologin as a user.
-autoLogin :: User -> Property UnixLike
+autoLogin :: User -> Property DebianLike
autoLogin (User u) = "/etc/lightdm/lightdm.conf" `ConfFile.containsIniSetting`
("SeatDefaults", "autologin-user", u)
`describe` "lightdm autologin"
+ `requires` installed