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

Simplify unionfs-chroot bind-mounting

Browse Source
This commit is contained in:
Shea Levy 2012-12-16 13:07:42 -05:00
parent e34024d998
commit d19c223ba6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/installer/cd-dvd/iso-image.nix
View File

@ -202,20 +202,20 @@ in
# /nix/store (the squashfs image) to make this a live CD. # /nix/store (the squashfs image) to make this a live CD.
boot.initrd.postMountCommands = boot.initrd.postMountCommands =
'' ''
mkdir -p /unionfs-chroot$targetRoot mkdir -p /unionfs-chroot/ro-root
mount --rbind $targetRoot /unionfs-chroot$targetRoot mount --rbind $targetRoot /unionfs-chroot/ro-root
mkdir /unionfs-chroot/mnt-root-tmpfs mkdir /unionfs-chroot/rw-root
mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-root-tmpfs mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root
mkdir /mnt-root-union mkdir /mnt-root-union
unionfs -o allow_other,cow,chroot=/unionfs-chroot /mnt-root-tmpfs=RW:$targetRoot=RO /mnt-root-union unionfs -o allow_other,cow,chroot=/unionfs-chroot /rw-root=RW:/ro-root=RO /mnt-root-union
oldTargetRoot=$targetRoot oldTargetRoot=$targetRoot
targetRoot=/mnt-root-union targetRoot=/mnt-root-union
mkdir /unionfs-chroot/mnt-store-tmpfs mkdir /unionfs-chroot/rw-store
mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-store-tmpfs mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
mkdir -p $oldTargetRoot/nix/store mkdir -p $oldTargetRoot/nix/store
unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /mnt-store-tmpfs=RW:$oldTargetRoot/nix/store=RO /mnt-root-union/nix/store unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
''; '';
# Closures to be copied to the Nix store on the CD, namely the init # Closures to be copied to the Nix store on the CD, namely the init

10
modules/virtualisation/qemu-vm.nix
View File

@ -286,12 +286,12 @@ in
mkdir -p $targetRoot/boot mkdir -p $targetRoot/boot
mount -o remount,ro $targetRoot/nix/store mount -o remount,ro $targetRoot/nix/store
${optionalString cfg.writableStore '' ${optionalString cfg.writableStore ''
mkdir -p /unionfs-chroot$targetRoot mkdir -p /unionfs-chroot/ro-store
mount --rbind $targetRoot /unionfs-chroot$targetRoot mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store
mkdir /unionfs-chroot/mnt-store-tmpfs mkdir /unionfs-chroot/rw-store
mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-store-tmpfs mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /mnt-store-tmpfs=RW:$targetRoot/nix/store=RO $targetRoot/nix/store unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-store=RW:/ro-store=RO $targetRoot/nix/store
''} ''}
''; '';