woodci/alma
1
0
Fork 0
mirror of https://github.com/philmmanjaro/alma.git synced 2025-07-26 23:19:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Generate locale (fix #19)

Browse Source
This commit is contained in:
Roey Darwish Dror 2019-05-27 14:15:40 +03:00
parent 2a987be160
commit 0492847d51
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/error.rs
View File

@ -67,6 +67,9 @@ pub enum ErrorKind {
#[fail(display = "Error closing the encrypted device")] #[fail(display = "Error closing the encrypted device")]
LuksClose, LuksClose,
#[fail(display = "Error setting the locale")]
Locale,
} }
impl Fail for Error { impl Fail for Error {

18
src/main.rs
View File

@ -213,6 +213,24 @@ fn create(command: CreateCommand) -> Result<(), Error> {
) )
.context(ErrorKind::PostInstallation)?; .context(ErrorKind::PostInstallation)?;
info!("Setting locale");
fs::OpenOptions::new()
.append(true)
.write(true)
.open(mount_point.path().join("etc/locale.gen"))
.and_then(|mut locale_gen| locale_gen.write_all(b"en_US.UTF-8 UTF-8\n"))
.context(ErrorKind::Locale)?;
fs::write(
mount_point.path().join("etc/locale.conf"),
"LANG=en_US.UTF-8",
)
.context(ErrorKind::Locale)?;
arch_chroot
.execute()
.arg(mount_point.path())
.arg("locale-gen")
.run(ErrorKind::Locale)?;
info!("Generating initramfs"); info!("Generating initramfs");
fs::write(mount_point.path().join("etc/mkinitcpio.conf"), MKINITCPIO) fs::write(mount_point.path().join("etc/mkinitcpio.conf"), MKINITCPIO)
.context(ErrorKind::Initramfs)?; .context(ErrorKind::Initramfs)?;