From 4e8448778cdec05f994f0e2772432fd90b6219d5 Mon Sep 17 00:00:00 2001
From: Chuyan Zhang <me@zcy.moe>
Date: Fri, 1 Dec 2023 21:18:52 -0800
Subject: Fix mount options

---
 mkfs.aya/src/main.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'mkfs.aya')

diff --git a/mkfs.aya/src/main.rs b/mkfs.aya/src/main.rs
index 00bef5b..939f9d1 100644
--- a/mkfs.aya/src/main.rs
+++ b/mkfs.aya/src/main.rs
@@ -16,6 +16,10 @@ use crate::ioctl::ioctl_blkgetsize64;
 #[command(author, version, about)]
 struct Args {
     block_device: Option<PathBuf>,
+    #[arg(short, long)]
+    user_id: Option<u32>,
+    #[arg(short, long)]
+    group_id: Option<u32>,
     #[arg(short, action = clap::ArgAction::Count)]
     verbosity: u8,
 }
@@ -40,6 +44,9 @@ fn main() {
     let device_path = args.block_device
         .expect("Not device path specified.");
     let verbosity = args.verbosity;
+    let uid = args.user_id.unwrap_or_else(get_current_uid);
+    let gid = args.group_id.unwrap_or_else(get_current_gid);
+
     let log_level = match verbosity {
         0 => LevelFilter::Error,
         1 => LevelFilter::Warn,
@@ -53,8 +60,8 @@ fn main() {
     let mut fs = AyaFS::new(
         disk,
         device_size as usize / BLOCK_SIZE,
-        get_current_uid(),
-        get_current_gid(),
+        uid,
+        gid,
     );
     fs.write_back();
 }
-- 
cgit v1.2.3-70-g09d2