also use mkisofs from Nixpkgs

svn path=/nixu/trunk/; revision=5563
This commit is contained in:
Armijn Hemel 2006-07-03 09:32:15 +00:00
parent a60d5c3bdb
commit c984b735bd
2 changed files with 5 additions and 4 deletions

View File

@ -11,6 +11,7 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)) gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -)) gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
archivesDir=$($mktemp/bin/mktemp -d) archivesDir=$($mktemp/bin/mktemp -d)
manifest=${archivesDir}/MANIFEST manifest=${archivesDir}/MANIFEST
@ -257,9 +258,9 @@ rm -f ${initrd}
echo creating ISO image echo creating ISO image
mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \ $cdrtools/bin/mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin \
-no-emul-boot -boot-load-size 4 -boot-info-table \ -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
${archivesDir} -boot-info-table ${archivesDir}
# cleanup, be diskspace friendly # cleanup, be diskspace friendly

View File

@ -5,7 +5,7 @@ rec {
nettools nixUnstable subversion gcc wget which vim less screen openssh binutils nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp; dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools;
boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim