Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 79337e1d5efe
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 235799920cd7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 29, 2018

  1. libvirtd build: drop support for tmpfs during image build 

    *Note*: caution, this patch breaks the compatibility with NixOS 17.09 and
should only be used in unstable branches.

Originally NixOS/nixpkgs@0d27df2
dropped support for `tempfs` which broke the libvirtd image build as it
still created custom kernel nodes.

These `mkdnod` calls were wrapped by conditionls to keep support with 17.09,
but now as 17.09 is the oldstable release which only receives security
fixes (https://groups.google.com/forum/#!msg/nix-devel/7bRK8FUcC5s/CV4-i0JdBgAJ),
so it's time to drop this compliance hacks.
    @Ma27
    Ma27 committed Jun 29, 2018
    Copy the full SHA
    83eeb56 View commit details

Commits on Apr 20, 2019

  1. Merge pull request #974 from Ma27/drop-17.09-compliancy 

    libvirtd build: drop support for `tmpfs` during image build
    @AmineChikhaoui
    AmineChikhaoui authored Apr 20, 2019
    Copy the full SHA
    2357999 View commit details
Showing with 0 additions and 16 deletions.
  1. +0 −8 nix/libvirtd-image.nix
  2. +0 −8 nix/libvirtd.nix
8 changes: 0 additions & 8 deletions nix/libvirtd-image.nix
View file
Original file line number Diff line number Diff line change
@@ -39,14 +39,6 @@ in pkgs.vmTools.runInLinuxVM (
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
# TODO (@Ma27) remove this entirely after NixOS 17.09 is EOLed, in
# 18.03 `devtmpfs` is used which makes the block creation obsolete
# (see https://github.com/NixOS/nixpkgs/commit/0d27df280f7ed502bba65e2ea13469069f9b275a)
if [ ! -b /dev/vda1 ]; then
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
fi
# Create an empty filesystem and mount it.
${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
8 changes: 0 additions & 8 deletions nix/libvirtd.nix
View file
Original file line number Diff line number Diff line change
@@ -22,14 +22,6 @@ let
'';
}
''
# TODO (@Ma27) remove this entirely after NixOS 17.09 is EOLed, in
# 18.03 `devtmpfs` is used which makes the block creation obsolete
# (see https://github.com/NixOS/nixpkgs/commit/0d27df280f7ed502bba65e2ea13469069f9b275a)
if [ ! -b /dev/vda1 ]; then
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
fi
mkdir /mnt
mount /dev/vda1 /mnt