summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/HostingProvider
diff options
context:
space:
mode:
authorJoey Hess2015-05-22 14:16:16 -0400
committerJoey Hess2015-05-22 14:16:16 -0400
commit53f2646c4520e5c788d4b60dae63049222737acc (patch)
tree39086348281d342fa87de9211950a94d34753894 /src/Propellor/Property/HostingProvider
parentda4636eb28e86d6909e2160c2ba7a00dcafc7ca9 (diff)
parente661aad6c493e31b6bd8109ca3d5c90bec28626a (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/HostingProvider')
-rw-r--r--src/Propellor/Property/HostingProvider/DigitalOcean.hs4
-rw-r--r--src/Propellor/Property/HostingProvider/Linode.hs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/HostingProvider/DigitalOcean.hs b/src/Propellor/Property/HostingProvider/DigitalOcean.hs
index be62ccdc..a5de9818 100644
--- a/src/Propellor/Property/HostingProvider/DigitalOcean.hs
+++ b/src/Propellor/Property/HostingProvider/DigitalOcean.hs
@@ -9,7 +9,7 @@ import qualified Propellor.Property.Reboot as Reboot
import Data.List
--- Digital Ocean does not provide any way to boot
+-- | Digital Ocean does not provide any way to boot
-- the kernel provided by the distribution, except using kexec.
-- Without this, some old, and perhaps insecure kernel will be used.
--
@@ -40,7 +40,7 @@ runningInstalledKernel = do
findVersion kernelver <$>
readProcess "file" ("-L" : kernelimages)
--- File output looks something like this, we want to unambiguously
+-- | File output looks something like this, we want to unambiguously
-- match the running kernel version:
-- Linux kernel x86 boot executable bzImage, version 3.16-3-amd64 (debian-kernel@lists.debian.org) #1 SMP Debian 3.1, RO-rootFS, swap_dev 0x2, Normal VGA
findVersion :: String -> String -> Bool
diff --git a/src/Propellor/Property/HostingProvider/Linode.hs b/src/Propellor/Property/HostingProvider/Linode.hs
index 4dd66129..40be4c2e 100644
--- a/src/Propellor/Property/HostingProvider/Linode.hs
+++ b/src/Propellor/Property/HostingProvider/Linode.hs
@@ -6,7 +6,7 @@ import qualified Propellor.Property.File as File
import Utility.FileMode
-- | Linode's pv-grub-x86_64 does not currently support booting recent
--- Debian kernels compressed with xz. This sets up pv-grub chaing to enable
+-- Debian kernels compressed with xz. This sets up pv-grub chaining to enable
-- it.
chainPVGrub :: Grub.TimeoutSecs -> Property NoInfo
chainPVGrub = Grub.chainPVGrub "hd0" "xen/xvda"