public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2650 from doublec/fhs-chroot-fix

Browse Source 
Add -p to mkdir in build-fhs-chrootenv to prevent error if directory exists
This commit is contained in:
Rob Vermaas 2014-05-16 09:09:23 +02:00
commit eef6cac0ab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/build-fhs-chrootenv/init.sh.in
View File

@ -36,9 +36,9 @@ rm $chrootenvDest/etc/pam.d
ln -s ../host-etc/static/pam.d $chrootenvDest/etc/pam.d ln -s ../host-etc/static/pam.d $chrootenvDest/etc/pam.d
# Symlink Font stuff # Symlink Font stuff
mkdir $chrootenvDest/etc/fonts mkdir -p $chrootenvDest/etc/fonts
ln -s ../../host-etc/static/fonts/fonts.conf $chrootenvDest/etc/fonts ln -s ../../host-etc/static/fonts/fonts.conf $chrootenvDest/etc/fonts
mkdir $chrootenvDest/etc/fonts/conf.d mkdir -p $chrootenvDest/etc/fonts/conf.d
ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fonts/conf.d ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fonts/conf.d
# Create root folder # Create root folder