diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:31:09 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:42:04 +0300 |
| commit | 64c043e63a4be97f59fd1906c47973a74eedda67 (patch) | |
| tree | 37b15dfb4830e4f874edca87b521b6e9cdc3c81b /gnu/system | |
| parent | b1f763de54dc2b8e240d0f01f7948ce76f67243e (diff) | |
| parent | 75af73e1b7ac58770122d8831faa3a8158638bb0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/image.scm | 8 | ||||
| -rw-r--r-- | gnu/system/linux-container.scm | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index dd32e58c2d..f02f6e0b8c 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -312,7 +312,9 @@ used in the image." (cond ((member 'esp flags) "0xEF") ((string-prefix? "ext" file-system) "0x83") - ((string=? file-system "vfat") "0x0E") + ((or (string=? file-system "vfat") + (string=? file-system "fat16")) "0x0E") + ((string=? file-system "fat32") "0x0C") (else (raise (condition (&message @@ -329,7 +331,9 @@ used in the image." (cond ((member 'esp flags) "U") ((string-prefix? "ext" file-system) "L") - ((string=? file-system "vfat") "F") + ((or (string=? file-system "vfat") + (string=? file-system "fat16") + (string=? file-system "fat32")) "F") (else (raise (condition (&message diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index eeb0f68c02..24077e347a 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -129,8 +129,7 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." static-networking-service-type dhcp-client-service-type network-manager-service-type - connman-service-type - wicd-service-type) + connman-service-type) (list)))) (define services-to-add |