diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-11 22:30:53 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-12 09:34:47 +0900 |
| commit | 11b82cdaf22402d500d82671fb26550137e8a168 (patch) | |
| tree | 878248912372fd2372ffd4f44427425dfc9178e6 /src | |
| parent | 6bfcb080bf5b0eb0ed7bf9d908c298d664570bf1 (diff) | |
attempt to fix Exoscale.distroKernel flag file
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/HostingProvider/Exoscale.hs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Propellor/Property/HostingProvider/Exoscale.hs b/src/Propellor/Property/HostingProvider/Exoscale.hs index afa3e1b7..f7d676d0 100644 --- a/src/Propellor/Property/HostingProvider/Exoscale.hs +++ b/src/Propellor/Property/HostingProvider/Exoscale.hs @@ -15,9 +15,10 @@ import qualified Propellor.Property.Reboot as Reboot -- We reboot after doing this because 'Sbuild.built' will fail to set up an -- overlay-type chroot on an old kernel distroKernel :: Architecture -> Property DebianLike -distroKernel arch = Grub.installed' Grub.PC - `before` Apt.installed ["linux-image-" ++ arch] - `before` Grub.boots "/dev/vda" - `before` Grub.mkConfig - `before` Reboot.now - `flagFile` "/etc/propellor-grub" +distroKernel arch = combineProperties "boots distro kernel" $ props + & Grub.installed' Grub.PC + & Apt.installed ["linux-image-" ++ arch] + & Grub.boots "/dev/vda" + & flagFile + (Grub.mkConfig `before` Reboot.now) + "/etc/propellor-distro-kernel" |