update
This commit is contained in:
@@ -1,35 +0,0 @@
|
||||
From 616fccece704b632427f9c8e1b7d2a4c8b7907d1 Mon Sep 17 00:00:00 2001
|
||||
From: John Baublitz <jbaublitz@redhat.com>
|
||||
Date: Thu, 9 Jul 2020 15:41:54 -0400
|
||||
Subject: [PATCH] Fix issue of devicemapper-rs compatibility with musl
|
||||
|
||||
---
|
||||
src/core/dm.rs | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/core/dm.rs b/src/core/dm.rs
|
||||
index fe598c6..3c6d925 100644
|
||||
--- a/src/core/dm.rs
|
||||
+++ b/src/core/dm.rs
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
use std::{cmp, fs::File, mem::size_of, os::unix::io::AsRawFd, slice, u32};
|
||||
|
||||
-use nix::libc::{c_ulong, ioctl as nix_ioctl};
|
||||
+use nix::libc::ioctl as nix_ioctl;
|
||||
|
||||
use crate::{
|
||||
core::{
|
||||
@@ -136,8 +136,7 @@ impl DM {
|
||||
.as_mut()
|
||||
.expect("pointer to own structure v can not be NULL")
|
||||
};
|
||||
- let op =
|
||||
- request_code_readwrite!(DM_IOCTL, ioctl, size_of::<dmi::Struct_dm_ioctl>()) as c_ulong;
|
||||
+ let op = request_code_readwrite!(DM_IOCTL, ioctl, size_of::<dmi::Struct_dm_ioctl>());
|
||||
loop {
|
||||
if let Err(err) =
|
||||
unsafe { convert_ioctl_res!(nix_ioctl(self.file.as_raw_fd(), op, v.as_mut_ptr())) }
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
# Copyright 1999-2019 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
command="/usr/bin/stratisd"
|
||||
command="/usr/libexec/stratisd"
|
||||
command_args="--debug"
|
||||
command_background=true
|
||||
output_log=/var/log/stratisd.log
|
||||
error_log=/var/log/stratisd.log
|
||||
pidfile=${pidfile:-/run/stratisd.pid}
|
||||
description="Easy to use local storage management for Linux"
|
||||
description="Daemon that manages block devices to create filesystems"
|
||||
description_start="Start stratis daemon"
|
||||
description_stop="Stop stratis daemon"
|
||||
|
||||
depend() {
|
||||
need sysfs dev-settle
|
||||
need sysfs dev-settle
|
||||
before fsck checkfs
|
||||
after modules
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user