From 679c3f929536c29f019dcc05f9ecef749eb16bcd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Oct 2009 13:10:08 +0000 Subject: [PATCH] * Fix the xfsprogs/jfsutils attribute names. TODO: these shouldn't be listed in three different places. The set of "rescue" packages should be factored out into a separate module. svn path=/nixos/trunk/; revision=17727 --- .../installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix | 2 +- modules/installer/cd-dvd/installation-cd-rescue.nix | 2 +- modules/installer/cd-dvd/live-dvd.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix index 2cde633c4be..f3f0a9fe50d 100644 --- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix +++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix @@ -34,7 +34,7 @@ rec { klibc dmraid cryptsetup ccrypt utillinuxCurses ddrescue testdisk pciutils sdparm hdparm usbutils - btrfsProgs xfsProgs jfsUtils jfsrec + btrfsProgs xfsprogs jfsutils jfsrec wpa_supplicant iproute manpages openssh openssl ncat socat fuse ntfs3g gnupg gnupg2 diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix index 028c3a1f76c..9be701e1bd2 100644 --- a/modules/installer/cd-dvd/installation-cd-rescue.nix +++ b/modules/installer/cd-dvd/installation-cd-rescue.nix @@ -19,7 +19,7 @@ environment.systemPackages = with pkgs; [ utillinuxCurses ddrescue pciutils sdparm hdparm hddtemp usbutils - btrfsProgs xfsProgs jfsUtils jfsrec + btrfsProgs xfsprogs jfsutils jfsrec wpa_supplicant iproute fuse ntfs3g smbfsFuse sshfsFuse manpages irssi elinks mcabber mutt openssh lftp diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix index aa8a164c033..655376fdea4 100644 --- a/modules/installer/cd-dvd/live-dvd.nix +++ b/modules/installer/cd-dvd/live-dvd.nix @@ -34,8 +34,8 @@ pkgs.ddrescue pkgs.cdrkit pkgs.btrfsProgs - pkgs.xfsProgs - pkgs.jfsUtils + pkgs.xfsprogs + pkgs.jfsutils pkgs.jfsrec pkgs.ntfs3g pkgs.subversion16