Merge pull request #1 from UsernameSwift/master

Make it build & fix a typo
axtloss/rework-partitioning
axtloss 2 years ago committed by GitHub
commit 9fac01d3d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -50,7 +50,7 @@ jade genfstab
jade locale colemak Europe/Berlin en_US.UTF-8 UTF-8 jade locale colemak Europe/Berlin en_US.UTF-8 UTF-8
``` ```
### configue network settings ### configure network settings
```sh ```sh
# set the hostname to getcryst.al with ipv6 disabled # set the hostname to getcryst.al with ipv6 disabled
jade networking getcryst.al jade networking getcryst.al

@ -9,7 +9,7 @@ pub fn install_base_packages(kernel: String) {
std::fs::create_dir_all("/mnt/etc").unwrap(); std::fs::create_dir_all("/mnt/etc").unwrap();
files::copy_file("/etc/pacman.conf", "/mnt/etc/pacman.conf"); files::copy_file("/etc/pacman.conf", "/mnt/etc/pacman.conf");
if kernel.is_empty() { if kernel.is_empty() {
kernel_to_install = "linux".to_string kernel_to_install = "linux".to_string();
} else { } else {
match kernel.as_str() { match kernel.as_str() {
"linux" => kernel_to_install = "linux".to_string(), "linux" => kernel_to_install = "linux".to_string(),

@ -144,7 +144,7 @@ pub fn remount(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev: &str
pub fn setup_unakite(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev: &str) { pub fn setup_unakite(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev: &str) {
log::debug!("Setting up Unakite"); log::debug!("Setting up Unakite");
remount(root, oldroot, efi, efidir, bootdev, true); remount(root, oldroot, efi, efidir, bootdev, true);
base::install_base_packages(); base::install_base_packages("linux".to_string());
base::genfstab(); base::genfstab();
locale::set_locale("en_US.UTF-8 UTF-8".to_string()); locale::set_locale("en_US.UTF-8 UTF-8".to_string());
locale::set_timezone("Europe/Berlin"); // TODO: get the proper timezone locale::set_timezone("Europe/Berlin"); // TODO: get the proper timezone
@ -203,4 +203,4 @@ pub fn setup_unakite(root: &str, oldroot: &str, efi: bool, efidir: &str, bootdev
), ),
"Recreate grub.cfg in crystal" "Recreate grub.cfg in crystal"
); );
} }

@ -107,7 +107,7 @@ pub fn read_config(configpath: PathBuf) {
&mut partitions, &mut partitions,
config.unakite.enable config.unakite.enable
); );
base::install_base_packages(kernel); base::install_base_packages(config.kernel);
base::genfstab(); base::genfstab();
println!(); println!();
log::info!("Installing bootloader : {}", config.bootloader.r#type); log::info!("Installing bootloader : {}", config.bootloader.r#type);

Loading…
Cancel
Save