Skip to content

Commit c95680b

Browse files
committed
cleanups to satisfy 'make check'
1 parent 05c5625 commit c95680b

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
#
8-
# Copyright 2024 MNX Cloud, Inc.
8+
# Copyright 2025 MNX Cloud, Inc.
99
#
1010

1111
NAME = smartos-ui
@@ -190,3 +190,9 @@ include ./deps/eng/tools/mk/Makefile.deps
190190
include ./deps/eng/tools/mk/Makefile.targ
191191
include ./deps/eng/tools/mk/Makefile.rust.targ
192192

193+
.PHONY: world
194+
world: $(TOP)/tools/uiadm.sh
195+
196+
.PHONY: install
197+
install: $(TOP)/tools/uiadm.sh
198+
cp -p $< $(DESTDIR)/sbin/uiadm

executor/src/endpoints/image.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
/*
8-
* Copyright 2024 MNX Cloud, Inc.
8+
* Copyright 2025 MNX Cloud, Inc.
99
*/
1010

1111
use std::process::Stdio;
@@ -186,7 +186,7 @@ pub async fn post_import_by_id(
186186
return Err(to_internal_error("Unable to get image import queue"));
187187
}
188188

189-
let args = ["import", "-q", "-S", &req.url.as_ref(), &id.to_string()];
189+
let args = ["import", "-q", "-S", req.url.as_ref(), &id.to_string()];
190190
debug!(ctx.log, "Executing imgadm {:?}", &args);
191191
let out = Command::new("imgadm")
192192
.args(args)

shared/src/image.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,13 @@ impl Image {
268268
/// Helper for determining if we should offer the option of setting a
269269
/// root_pw for an image
270270
pub fn has_root_user(&self) -> bool {
271-
return match &self.manifest.r#type {
271+
match &self.manifest.r#type {
272272
Type::ZVol => match &self.manifest.users {
273273
Some(users) => users.iter().any(|user| user.name == "root"),
274274
None => true,
275275
},
276276
_ => false,
277-
};
277+
}
278278
}
279279

280280
/// Helper for determining if we should set the bootrom to uefi

0 commit comments

Comments
 (0)