From ab5652ff75a96ee0a3615a8fc82e7dfa0c0d9dc6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 5 Jul 2017 18:00:59 -0400 Subject: Image.grubBooted no longer takes a BIOS parameter * DiskImage.grubBooted no longer takes a BIOS parameter, and no longer implicitly adds Grub.installed to the properties of the disk image. If you used DiskImage.grubBooted, you'll need to update your propellor configuration, removing the BIOS parameter from grubBooted and adding a Grub.installed property to the disk image, eg: & Grub.installed PC (API change) * Grub.installed: Avoid running update-grub when used in a chroot, since it will get confused. * DiskImage.Finalization: Simplified this type since it does not need to be used to install packages anymore. (API change) The advantage of doing this comes when using hostChroot with imageBuilt, since the Host then has its Grub.installed property explicitly listed so propellor knows about it when otherwise deploying that host. Also, it simplifies the quite complex imageBuilt parameters. This commit was sponsored by Ewen McNeill. --- joeyconfig.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 1be4ff14..bade7c0d 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -99,7 +99,7 @@ darkstar = host "darkstar.kitenet.net" $ props & imageBuilt "/srv/propellor-disk.img" (Chroot.hostChroot demo (Chroot.Debootstrapped mempty)) - MSDOS (grubBooted PC) + MSDOS grubBooted [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag , partition EXT4 `mountedAt` "/" @@ -113,6 +113,7 @@ demo :: Host demo = host "demo" $ props & osDebian Unstable X86_64 & Apt.installed ["linux-image-amd64"] + & Grub.installed PC & bootstrappedFrom GitRepoOutsideChroot & User.accountFor user & root `User.hasInsecurePassword` "debian" -- cgit v1.2.3