JohnyTheCarrot/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Issues Pull requests Packages Projects Releases Wiki Activity

but 558fc6da59 breaks systems witzh automount! now both should work.

Browse source
This commit is contained in:
Erin 2022-12-23 22:55:38 +01:00 committed by ondra05
parent 3414b40da8
commit eae5979921
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
repbuild/src/main.rs
View file

@ -151,11 +151,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.build()?; .build()?;
// Mount the filesystem // Mount the filesystem
let mountpoint = fsproxy.mount(MountOptions { let mountpoint = fsproxy
no_user_interaction: true, .mount(MountOptions {
fs_type: String::new(), no_user_interaction: true,
mount_options: String::new(), fs_type: String::new(),
})?; mount_options: String::new(),
})
.or_else(|_| {
Ok::<String, zbus::Error>(loop {
if let Some(m) = fsproxy.mount_points()?.get(0) {
break m.to_string();
}
})
})?;
// copy ./base/* over to ./disk // copy ./base/* over to ./disk
Command::new("sh") Command::new("sh")
@ -373,11 +381,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.build()?; .build()?;
// Mount the filesystem // Mount the filesystem
let mountpoint = fsproxy.mount(MountOptions { let mountpoint = fsproxy
no_user_interaction: true, .mount(MountOptions {
fs_type: String::new(), no_user_interaction: true,
mount_options: String::new(), fs_type: String::new(),
})?; mount_options: String::new(),
})
.or_else(|_| {
Ok::<String, zbus::Error>(loop {
if let Some(m) = fsproxy.mount_points()?.get(0) {
break m.to_string();
}
})
})?;
// copy the kernel over to ./disk/boot/kernel // copy the kernel over to ./disk/boot/kernel
Command::new("cp") Command::new("cp")