diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2018-02-14 14:38:27 -0600 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2018-02-14 14:39:11 -0600 |
| commit | c756381a157ee8c3de2924685791d962eeb3d341 (patch) | |
| tree | 7a6fb1cbdf69793e8d810264d537df5fb474f12b /sys-fs | |
| parent | www-client/chromium: stable channel bump (64.0.3282.167) (diff) | |
| download | gentoo-c756381a157ee8c3de2924685791d962eeb3d341.tar.gz gentoo-c756381a157ee8c3de2924685791d962eeb3d341.tar.bz2 gentoo-c756381a157ee8c3de2924685791d962eeb3d341.zip | |
sys-fs/zfs: make modprobe optional for systemd unit files
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/zfs/files/zfs.service.in | 2 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in index c390a480708e..ae2eff170a72 100644 --- a/sys-fs/zfs/files/zfs.service.in +++ b/sys-fs/zfs/files/zfs.service.in @@ -6,7 +6,7 @@ After=systemd-udev-settle.target local-fs.target [Service] Type=oneshot RemainAfterExit=yes -ExecStartPre=/sbin/modprobe zfs +ExecStartPre=-/sbin/modprobe zfs ExecStartPre=/usr/bin/test -c /dev/zfs ExecStart=/usr/libexec/zfs-init.sh ExecStop=@sbindir@/zfs umount -a diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 7b8d2f94a45c..5cfa93fa4c50 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -87,12 +87,6 @@ src_prepare() { -e "s|/sbin/parted|/usr/sbin/parted|" \ -i scripts/common.sh.in - if use kernel-builtin - then - einfo "kernel-builtin enabled, removing module loading from" - einfo "systemd units." - sed -i -e '/modprobe\ zfs/d' etc/systemd/system/*.service.in || die - fi autotools-utils_src_prepare } @@ -120,10 +114,6 @@ src_configure() { sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ > "${T}/zfs-init.sh" || die - if use kernel-builtin - then - sed -i -e '/modprobe\ zfs/d' "${T}/zfs.service" || die - fi } src_install() { |