2 files changed, 20 insertions, 14 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 1012fa6158..6e3fd51294 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -326,7 +326,8 @@ used in the image."
              (image-builder
               (with-imported-modules*
                (let ((initializer #$(partition-initializer partition))
-                     (inputs '#+(list e2fsprogs fakeroot dosfstools mtools))
+                     (inputs '#+(list coreutils e2fsprogs fakeroot dosfstools
+                                      mtools util-linux))
                      (image-root "tmp-root"))
                  (sql-schema #$schema)
 
@@ -338,18 +339,19 @@ used in the image."
                          #+(file-append glibc-utf8-locales "/lib/locale"))
                  (setlocale LC_ALL "en_US.utf8")
 
-                 (initializer image-root
-                              #:references-graphs '#$graph
-                              #:deduplicate? #f
-                              #:system-directory #$os
-                              #:grub-efi #+grub-efi
-                              #:bootloader-package
-                              #+(bootloader-package bootloader)
-                              #:bootloader-installer
-                              #+(bootloader-installer bootloader)
-                              #:bootcfg #$bootcfg
-                              #:bootcfg-location
-                              #$(bootloader-configuration-file bootloader))
+                 (when initializer
+                   (initializer image-root
+                                #:references-graphs '#$graph
+                                #:deduplicate? #f
+                                #:system-directory #$os
+                                #:grub-efi #+grub-efi
+                                #:bootloader-package
+                                #+(bootloader-package bootloader)
+                                #:bootloader-installer
+                                #+(bootloader-installer bootloader)
+                                #:bootcfg #$bootcfg
+                                #:bootcfg-location
+                                #$(bootloader-configuration-file bootloader)))
                  (make-partition-image #$(partition->gexp partition)
                                        #$output
                                        image-root)))))
diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm
index eac5b7f7e6..54fcf32cdd 100644
--- a/gnu/system/images/hurd.scm
+++ b/gnu/system/images/hurd.scm
@@ -84,7 +84,11 @@
            (file-system "ext2")
            (file-system-options '("-o" "hurd" "-O" "ext_attr"))
            (flags '(boot))
-           (initializer hurd-initialize-root-partition))))))
+           (initializer hurd-initialize-root-partition))
+          (partition
+           (size (* (expt 1024 2) 512))
+           (label "swap")
+           (file-system "swap"))))))
 
 (define hurd-image-type
   (image-type