5 files changed, 11 insertions, 20 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 2199d950..1a15f72c 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -84,7 +84,7 @@ stdSourcesList :: Property Debian
 stdSourcesList = withOS "standard sources.list" $ \w o -> case o of
 	(Just (System (Debian suite) _)) ->
 		ensureProperty w $ stdSourcesListFor suite
-	_ -> unsupportedOS
+	_ -> unsupportedOS'
 
 stdSourcesListFor :: DebianSuite -> Property Debian
 stdSourcesListFor suite = stdSourcesList' suite []
@@ -160,11 +160,11 @@ installed' params ps = robustly $ check (isInstallable ps) go
 installedBackport :: [Package] -> Property Debian
 installedBackport ps = withOS desc $ \w o -> case o of
 	(Just (System (Debian suite) _)) -> case backportSuite suite of
-		Nothing -> unsupportedOS
+		Nothing -> unsupportedOS'
 		Just bs -> ensureProperty w $
 			runApt (["install", "-t", bs, "-y"] ++ ps)
 				`changesFile` dpkgStatus
-	_ -> unsupportedOS
+	_ -> unsupportedOS'
   where
 	desc = unwords ("apt installed backport":ps)
 
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs
index fd5f6c96..e0c56966 100644
--- a/src/Propellor/Property/Debootstrap.hs
+++ b/src/Propellor/Property/Debootstrap.hs
@@ -101,21 +101,12 @@ extractSuite (System (FreeBSD _) _) = Nothing
 installed :: RevertableProperty Linux Linux
 installed = install <!> remove
   where
-	install = withOS "debootstrap installed" $ \w o ->
-		ifM (liftIO $ isJust <$> programPath)
-			( return NoChange
-			, ensureProperty w (installon o)
-			)
-
-	installon (Just (System (Debian _) _)) = aptinstall
-	installon (Just (System (Buntish _) _)) = aptinstall
-	installon _ = sourceInstall
+	install = check (isJust <$> programPath) $
+		(aptinstall `pickOS` sourceInstall)
+			`describe` "debootstrap installed"
 
-	remove = withOS "debootstrap removed" $ \w o -> 
-		ensureProperty w (removefrom o)
-	removefrom (Just (System (Debian _) _)) = aptremove
-	removefrom (Just (System (Buntish _) _)) = aptremove
-	removefrom _ = sourceRemove
+	remove = (aptremove `pickOS` sourceRemove)
+		`describe` "debootstrap removed"
 
 	aptinstall = Apt.installed ["debootstrap"]
 	aptremove = Apt.removed ["debootstrap"]
diff --git a/src/Propellor/Property/Grub.hs b/src/Propellor/Property/Grub.hs
index 85d098ed..a03fc5a0 100644
--- a/src/Propellor/Property/Grub.hs
+++ b/src/Propellor/Property/Grub.hs
@@ -30,7 +30,7 @@ mkConfig = tightenTargets $ cmdProperty "update-grub" []
 
 -- | Installs grub; does not run update-grub.
 installed' :: BIOS -> Property Linux
-installed' bios = (aptinstall `pickOS` aptinstall)
+installed' bios = (aptinstall `pickOS` unsupportedOS)
 	`describe` "grub package installed"
   where
 	aptinstall :: Property DebianLike
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 72753248..7d0a10ca 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -89,7 +89,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
 			debootstrap d
 		(Just u@(System (Buntish _) _)) -> ensureProperty w $
 			debootstrap u
-		_ -> unsupportedOS
+		_ -> unsupportedOS'
 	
 	debootstrap :: System -> Property Linux
 	debootstrap targetos =
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 7048de3b..369999b7 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -53,7 +53,7 @@ installed = withOS "ssh installed" $ \w o ->
 	in case o of
 		(Just (System (Debian _) _)) -> aptinstall
 		(Just (System (Buntish _) _)) -> aptinstall
-		_ -> unsupportedOS
+		_ -> unsupportedOS'
 
 restarted :: Property DebianLike
 restarted = Service.restarted "ssh"