image: Add default value for partition initializer.
Previously, the default value would lead to a wrong-type-to-apply crash. * gnu/system/image.scm (system-disk-image)[image-builder]: When 'partition-initializer' returns #f, fall back to INITIALIZE-ROOT-PARTITION. * gnu/tests/base.scm (run-root-unmount-test)[test-image]: Remove 'initializer' field of partition. * gnu/image.scm (<partition>)[initializer]: Add comment.
This commit is contained in:
		
							parent
							
								
									e871c3a857
								
							
						
					
					
						commit
						9f530ef38a
					
				
					 3 changed files with 3 additions and 3 deletions
				
			
		|  | @ -70,7 +70,7 @@ | |||
|   (label                partition-label (default #f)) | ||||
|   (uuid                 partition-uuid (default #f)) | ||||
|   (flags                partition-flags (default '())) | ||||
|   (initializer          partition-initializer (default #f))) | ||||
|   (initializer          partition-initializer (default #f))) ;gexp | #f | ||||
| 
 | ||||
|  | ||||
| ;;; | ||||
|  |  | |||
|  | @ -374,7 +374,8 @@ used in the image." | |||
|              (type (partition-file-system partition)) | ||||
|              (image-builder | ||||
|               (with-imported-modules* | ||||
|                (let ((initializer #$(partition-initializer partition)) | ||||
|                (let ((initializer (or #$(partition-initializer partition) | ||||
|                                       initialize-root-partition)) | ||||
|                      (inputs '#+(list e2fsprogs fakeroot dosfstools mtools)) | ||||
|                      (image-root "tmp-root")) | ||||
|                  (sql-schema #$schema) | ||||
|  |  | |||
|  | @ -637,7 +637,6 @@ in a loop.  See <http://bugs.gnu.org/26931>.") | |||
|                    (size 'guess) | ||||
|                    (offset (* 512 2048))          ;leave room for GRUB | ||||
|                    (flags '(boot)) | ||||
|                    (initializer #~initialize-root-partition) | ||||
|                    (label "root-under-test")))))) ;max 16 characters! | ||||
| 
 | ||||
|   (define observer-os | ||||
|  |  | |||
		Reference in a new issue