summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-03 22:12:05 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-03 22:43:00 +0200
commitcc4a2aeb984b8cd007c48a2fb140792ce2a70a56 (patch)
tree50dfae2058133794bf3751489b5f38f142a0b770 /gnu/system
parenta549ab4bcf5756d10981141720aba782dd5827ad (diff)
downloadpatches-cc4a2aeb984b8cd007c48a2fb140792ce2a70a56.tar
patches-cc4a2aeb984b8cd007c48a2fb140792ce2a70a56.tar.gz
gnu: Merge Parted, fdisk, and ddrescue in (gnu packages disk).
* gnu/packages/parted.scm: Rename to... * gnu/packages/disk.scm: ... this. New file. Merge with... * gnu/packages/fdisk.scm: ... this; remove file; * gnu/packages/ddrescue.scm: ... and this; remove file. * gnu/system/install.scm, gnu/system/vm.scm: Adjust accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Remove gnu/packages/{parted,fdisk,ddrescue}.scm and add gnu/packages/disk.scm.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/install.scm3
-rw-r--r--gnu/system/vm.scm2
2 files changed, 2 insertions, 3 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 3dbce0e3b8..a7036c33bb 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -27,8 +27,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages package-management)
#:use-module (gnu packages zile)
- #:use-module (gnu packages parted)
- #:use-module (gnu packages fdisk)
+ #:use-module (gnu packages disk)
#:use-module (gnu packages texinfo)
#:export (installation-os))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index c85445cd5f..99628de709 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -29,7 +29,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages less)
#:use-module (gnu packages qemu)
- #:use-module (gnu packages parted)
+ #:use-module (gnu packages disk)
#:use-module (gnu packages zile)
#:use-module (gnu packages grub)
#:use-module (gnu packages linux)