[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#44169] [PATCH 1/3] file-systems: Allow swap space lookup by UUID/la
From: |
Ludovic Courtès |
Subject: |
[bug#44169] [PATCH 1/3] file-systems: Allow swap space lookup by UUID/label. |
Date: |
Fri, 23 Oct 2020 12:07:52 +0200 |
* gnu/build/file-systems.scm (%linux-swap-magic, %page-size): New
variables.
(linux-swap-superblock?, read-linux-swap-superblock)
(linux-swap-superblock-uuid, linux-swap-superblock-volume-name): New
procedures.
(%partition-label-readers, %partition-uuid-readers): Add them.
---
gnu/build/file-systems.scm | 43 +++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 734d648575..54a24e8d18 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès
<ludo@gnu.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@@ -179,6 +179,43 @@ if DEVICE does not contain an ext2 file system."
(2 'reboot-required)
(_ 'fatal-error)))
+
+;;;
+;;; Linux swap.
+;;;
+
+;; Linux "swap space" is not a file system but it has a UUID and volume name,
+;; like actual file systems, and we want to be able to look up swap partitions
+;; by UUID and by label.
+
+(define %linux-swap-magic
+ (string->utf8 "SWAPSPACE2"))
+
+;; Like 'PAGE_SIZE' in Linux, arch/x86/include/asm/page.h.
+(define %page-size 4096)
+
+(define (linux-swap-superblock? sblock)
+ "Return #t when SBLOCK is an linux-swap superblock."
+ (and (= (bytevector-length sblock) %page-size)
+ (bytevector=? (sub-bytevector sblock (- %page-size 10) 10)
+ %linux-swap-magic)))
+
+(define (read-linux-swap-superblock device)
+ "Return the raw contents of DEVICE's linux-swap superblock as a bytevector,
or #f
+if DEVICE does not contain an linux-swap file system."
+ (read-superblock device 0 %page-size linux-swap-superblock?))
+
+;; See 'union swap_header' in 'include/linux/swap.h'.
+
+(define (linux-swap-superblock-uuid sblock)
+ "Return the UUID of Linux-swap superblock SBLOCK as a 16-byte bytevector."
+ (sub-bytevector sblock (+ 1024 4 4 4) 16))
+
+(define (linux-swap-superblock-volume-name sblock)
+ "Return the label of Linux-swap superblock SBLOCK as a string."
+ (null-terminated-latin1->string
+ (sub-bytevector sblock (+ 1024 4 4 4 16) 16)))
+
;;;
;;; Btrfs file systems.
@@ -596,6 +633,8 @@ partition field reader that returned a value."
iso9660-superblock-volume-name)
(partition-field-reader read-ext2-superblock
ext2-superblock-volume-name)
+ (partition-field-reader read-linux-swap-superblock
+ linux-swap-superblock-volume-name)
(partition-field-reader read-btrfs-superblock
btrfs-superblock-volume-name)
(partition-field-reader read-fat32-superblock
@@ -612,6 +651,8 @@ partition field reader that returned a value."
iso9660-superblock-uuid)
(partition-field-reader read-ext2-superblock
ext2-superblock-uuid)
+ (partition-field-reader read-linux-swap-superblock
+ linux-swap-superblock-uuid)
(partition-field-reader read-btrfs-superblock
btrfs-superblock-uuid)
(partition-field-reader read-fat32-superblock
--
2.28.0
- [bug#44169] [PATCH 0/3] Referring to swap with UUIDs and labels, Ludovic Courtès, 2020/10/23
- [bug#44169] [PATCH 1/3] file-systems: Allow swap space lookup by UUID/label.,
Ludovic Courtès <=
- [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field., Ludovic Courtès, 2020/10/23
- [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field., Mathieu Othacehe, 2020/10/23
- [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field., Ludovic Courtès, 2020/10/26
- [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field., Mathieu Othacehe, 2020/10/26
- [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field., Ludovic Courtès, 2020/10/28
- bug#44169: [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field., Ludovic Courtès, 2020/10/29
[bug#44169] [PATCH 2/3] services: swap: Allow for UUIDs and file system labels., Ludovic Courtès, 2020/10/23
[bug#44169] [PATCH 1/3] file-systems: Allow swap space lookup by UUID/label., Mathieu Othacehe, 2020/10/23