From f499a74998850743444bd1e32ed66acb383f3e73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 15:17:54 +0000
Subject: [PATCH] * Use cdrkit instead of cdrtools.

svn path=/nixos/trunk/; revision=10073
---
 configuration/rescue-cd.nix    | 2 +-
 helpers/make-iso9660-image.nix | 4 ++--
 helpers/make-iso9660-image.sh  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 433c137156e..6ec96175645 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -156,7 +156,7 @@ rec {
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
-    inherit (pkgs) stdenv perl cdrtools;
+    inherit (pkgs) stdenv perl cdrkit;
     isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index 8bf3467b7fd..c4ddfe6bceb 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, cdrtools
+{ stdenv, perl, cdrkit
 
   # The file name of the resulting ISO image.
 , isoName ? "cd.iso"
@@ -32,7 +32,7 @@ assert bootable -> bootImage != "";
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
-  buildInputs = [perl cdrtools];
+  buildInputs = [perl cdrkit];
   inherit isoName bootable bootImage;
 
   # !!! should use XML.
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 942e782dbad..5506161b051 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -58,7 +58,7 @@ done
 
 # !!! -f is a quick hack.
 ensureDir $out/iso
-mkisofs -r -J -o $out/iso/$isoName $bootFlags \
+genisoimage -r -J -o $out/iso/$isoName $bootFlags \
     -graft-points $graftList
 
 ensureDir $out/nix-support