diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-05 20:19:19 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-05 20:19:33 -0400 |
| commit | 68f864299303ac8d510f19d67e8d7e6fe0681138 (patch) | |
| tree | d026a14a58b374e8177da966a6b5d66b8f6ce303 /src/Propellor/Property/HostingProvider/Linode.hs | |
| parent | 7bbbfea9c9693508482e88ec0d4a5e8c4ee81e6a (diff) | |
DiskImage: Removed grubBooted
Properties that used to need it as a parameter now look at Info about the
bootloader that is installed in the chroot that the disk image is created
from. (API change)
This is a simplication, and avoids the user needing to repeat themselves
in the propellor config, thus avoiding mistakes.
When no boot loader is installed, or multiple different ones are,
disk image creation will fail, which seems reasonable.
This commit was sponsored by Jake Vosloo on Patreon.
Diffstat (limited to 'src/Propellor/Property/HostingProvider/Linode.hs')
| -rw-r--r-- | src/Propellor/Property/HostingProvider/Linode.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/HostingProvider/Linode.hs b/src/Propellor/Property/HostingProvider/Linode.hs index b48c1dac..ebe8d261 100644 --- a/src/Propellor/Property/HostingProvider/Linode.hs +++ b/src/Propellor/Property/HostingProvider/Linode.hs @@ -8,7 +8,7 @@ import Utility.FileMode -- | Configures grub to use the serial console as set up by Linode. -- Useful when running a distribution supplied kernel. -- <https://www.linode.com/docs/tools-reference/custom-kernels-distros/run-a-distribution-supplied-kernel-with-kvm> -serialGrub :: Property DebianLike +serialGrub :: Property (HasInfo + DebianLike) serialGrub = "/etc/default/grub" `File.containsLines` [ "GRUB_CMDLINE_LINUX=\"console=ttyS0,19200n8\"" , "GRUB_DISABLE_LINUX_UUID=true" @@ -22,7 +22,7 @@ serialGrub = "/etc/default/grub" `File.containsLines` -- | Linode's pv-grub-x86_64 (only used for its older XEN instances) -- does not support booting recent Debian kernels compressed -- with xz. This sets up pv-grub chaining to enable it. -chainPVGrub :: Grub.TimeoutSecs -> Property DebianLike +chainPVGrub :: Grub.TimeoutSecs -> Property (HasInfo + DebianLike) chainPVGrub = Grub.chainPVGrub "hd0" "xen/xvda" -- | Linode disables mlocate's cron job's execute permissions, |