Commit Graph

88 Commits

Author SHA1 Message Date
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Louis Taylor
259eb36205 zfs: 0.6.5.5 -> 0.6.5.6 2016-03-29 13:28:35 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Louis Taylor
e99eeb4c3f zfs: 0.6.5.4 -> 0.6.5.5 2016-03-15 15:41:00 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
f0e6c6ec0e linuxPackages.zfs: turn off pic hardening 2016-02-09 23:35:35 +00:00
Ricardo M. Correia
d51204e8de zfs: 0.6.5.3 -> 0.6.5.4 2016-01-19 16:34:14 +01:00
William A. Kennington III
f6361bc096 zfs: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
Ricardo M. Correia
ca9e807530 zfs: 0.6.5.1 -> 0.6.5.2 2015-10-05 12:58:19 +02:00
Eelco Dolstra
0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
William A. Kennington III
d9fd037e88 zfs + zfs_git: 0.6.5 -> 0.6.5.1 2015-09-19 15:02:59 -07:00
William A. Kennington III
4a672c87cd zfs: Add a patch to fix discard data corruption 2015-09-18 14:55:36 -07:00
William A. Kennington III
6727f76739 zfs: Update to 0.6.5 2015-09-11 17:45:38 -07:00
William A. Kennington III
66563862ec zfs: Fix build for kernel 4.2 2015-09-01 08:57:02 -07:00
William A. Kennington III
38e2c1586b zfs_git: 2015-07-21 -> 2015-08-30 2015-08-31 00:09:18 -07:00
William A. Kennington III
c034e966bf zfs_git: 2015-05-13 -> 2015-07-21 2015-07-22 12:22:15 -07:00
Luca Bruno
6f5aa25e89 Revert "zfs_git: 2015-06-22 -> 2015-07-01"
This reverts commit 54022375eb3ae3375385717690ef133c819c9bf1.

Revert "zfs_git: 2015-05-13 -> 2015-06-22"

This reverts commit 59faa759dade5c629409d683e72523548c40f554.

Closes #8941
2015-07-22 10:31:28 +02:00
William A. Kennington III
54022375eb zfs_git: 2015-06-22 -> 2015-07-01 2015-07-01 22:52:09 -07:00
William A. Kennington III
f6f9b9574d zfs: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:50:49 -07:00
William A. Kennington III
59faa759da zfs_git: 2015-05-13 -> 2015-06-22 2015-06-24 23:41:46 -07:00
William A. Kennington III
2a8cf39952 zfs: Fix kernel 4.1 compat 2015-06-24 23:33:28 -07:00
Ricardo M. Correia
3afae4037b zfs: Fix systemd warning
The `zfs-share` service was trying to execute the `rm` binary, but it
was providing an invalid `/bin` path.

This should fix #8171.
2015-06-04 17:35:39 +02:00
Eelco Dolstra
cdeb271101 zfs: Nuke references to linux.dev in *.ko files
This prevents linux.dev being included in the installation CD.
2015-06-04 11:06:44 +02:00
William A. Kennington III
a5979edc8a zfs_git: 2015-04-08 -> 2015-05-13 2015-05-15 18:38:13 -07:00
Ricardo M. Correia
8119b8a0e4 zfs: Update from 0.6.4 -> 0.6.4.1 2015-05-02 01:05:54 +02:00
William A. Kennington III
7b34703b70 zfs: Fix pkgconfig 2015-04-21 20:57:58 -07:00
William A. Kennington III
ef03b0ffde zfs_git: 2015-04-03 -> 2015-04-08 2015-04-09 13:21:46 -07:00
William A. Kennington III
d8bf90c8a0 zfs: 0.6.3 -> 0.6.4 2015-04-09 13:21:46 -07:00
William A. Kennington III
8c330acec8 zfs_git: 2015-03-25 -> 2015-04-03 2015-04-04 20:12:38 -07:00
William A. Kennington III
ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
William A. Kennington III
123bde971e zfs_git: 2015-03-20 -> 2015-03-25 2015-03-27 15:52:44 -07:00
William A. Kennington III
786f3216bc zfs_git: 2015-03-12 -> 2015-03-20 2015-03-22 12:20:53 -07:00
Ricardo M. Correia
5b074d20f8 zfs: Update from 0.6.3-1.2 -> 0.6.3-1.3 2015-03-19 06:08:08 +01:00
Ricardo M. Correia
92501d62f4 zfs_git: Update to 2015-03-12 2015-03-17 03:43:31 +01:00
William A. Kennington III
aad4e6fb84 zfs: 2015-03-05 -> 2015-03-10 2015-03-10 11:23:40 -07:00
William A. Kennington III
e49db703dc zfs_git: 2015-03-02 -> 2015-03-05 2015-03-06 11:56:43 -08:00
William A. Kennington III
ebcc826bd6 zfs_git: 2015-02-24 -> 2015-03-02 2015-03-03 13:01:37 -08:00
William A. Kennington III
f08e87a01e zfs_git: Update 2015-02-24 14:16:18 -08:00
Arseniy Seroka
a477e91f47 zfs-git: fix name (use date) 2015-02-23 20:30:14 +03:00
William A. Kennington III
50bcf4583f zfs_git: Update 2015-02-15 23:59:27 -08:00
William A. Kennington III
5742b24271 zfs_git: Update and remove obsolete patch 2015-02-11 14:47:37 -08:00
William A. Kennington III
f177036817 zfs: Modularize and create a userspace only package 2015-02-07 15:07:38 -08:00
William A. Kennington III
73c7c7978c zfs_git: Update to latest and add the compatability patch 2015-02-07 13:51:38 -08:00
William A. Kennington III
4ddf8af525 zfs_git: Update 2015-02-01 16:00:10 -08:00
Sebastián Bernardo Galkin
3c04907206 Fixup zfs python scripts
zfs ships with a couple of python scripts that needed shebang rewriting. Adding
python as a build dependency enables fixup to do the rewrite. This change
complements 390c838c7fd9e21266b33d00da91ffa3d7a3e706 by applying the same to the
git derivation.
2015-01-21 10:00:09 -08:00
Sebastián Bernardo Galkin
390c838c7f Fixup zfs python scripts
zfs ships with a couple of python scripts that needed shebang rewriting. Adding
python as a build dependency enables fixup to do the rewrite.
2015-01-20 23:54:51 -08:00
William A. Kennington III
e0a5b75d9c zfs: Update git version 2015-01-02 12:46:36 -08:00
William A. Kennington III
f6622403c8 zfs: 0.6.3 -> 0.6.3-1.2 2014-12-23 17:05:02 -08:00
Domen Kožar
27281f660c fix builds for rest of kernel modules on 3.18 2014-12-11 02:03:43 +01:00
Ricardo M. Correia
12e77fdc3f nixos/zfs: Improve the ZFS boot process
It turns out that the upstream systemd services that import ZFS pools contain
serious bugs. The first major problem is that importing pools fails if there
are no pools to import. The second major problem is that if a pool ends up in
/etc/zfs/zpool.cache but it disappears from the system (e.g. if you
reboot but during the reboot you unplug your ZFS-formatted USB pen drive),
then the import service will always fail and it will be impossible to get rid
of the pool from the cache (unless you manually delete the cache).

Also, the upstream service would always import all available ZFS pools every
boot, which may not be what is desired in some cases.

This commit will solve these problems in the following ways:

1. Ignore /etc/zfs/zpool.cache. This seems to be a major source of
issues, and also does not play well with NixOS's philosophy of
reproducible configurations. Instead, on every boot NixOS will try to import
the set of pools that are specified in its configuration.  This is also the
direction that upstream is moving towards.

2. Instead of trying to import all ZFS pools, only import those that are
actually necessary. NixOS will automatically determine these from the
config.fileSystems.* option. Also, the user can import any additional
pools every boot by adding them to the config.boot.zfs.extraPools
option, but this is only necessary if their filesystems are not
specified in config.fileSystems.*.

3. Added options to configure if ZFS should force-import ZFS pools. This may
currently be necessary, especially if your pools have not been correctly
imported with a proper host id configuration (which is probably true for 99% of
current NixOS ZFS users). Once host id configuration becomes mandatory when
using ZFS in NixOS and we are sure that most users have updated their
configurations and rebooted at least once, we should disable force-import by
default. Probably, this shouldn't be done before the next stable release.

WARNING: This commit may change the order in which your non-ZFS vs ZFS
filesystems are mounted.  To avoid this problem (now or in the future)
it is recommended that you set the 'mountpoint' property of your ZFS
filesystems to 'legacy', and that you manage them using
config.fileSystems, just like any other non-ZFS filesystem is usually
managed in NixOS.
2014-11-12 22:31:49 +01:00