Use Ext4 instead of btrfs

This commit is contained in:
Roey Darwish Dror 2018-12-02 16:50:13 +02:00
parent 8c41b390a3
commit 35ffccc352
4 changed files with 9 additions and 10 deletions

View File

@ -16,7 +16,7 @@ This tool should be ran from an exiting Arch Linux installations. It depends on
* partprobe
* Arch install scripts
* mkfs.fat
* mkfs.btrfs
* mkfs.ext4
* *Optional*: cryptsetup
Dependencies will be handled for you if you install alma from AUR.
@ -51,10 +51,10 @@ This tool doesn't aspire to be a generic installer for Arch Linux. Instead, it d
steps required to create a bootable USB with a few tweaks.
1. Partition the disk as suggested [here](http://valleycat.org/linux/arch-usb.html). The last
partition will be formatted as BTRFS
partition will be formatted as ext4
1. Bootstrap the system using `pacstrap -c`. The `-c` flag will use the host's cache instead the
drive's cache, which will speed up things when you create multiple drives. This tool will install
the base system, grub, intel-ucode, NetworkManager and btrfs-progs
the base system, grub, intel-ucode and NetworkManager
1. Generate initramfs without the `autodetect` hook
1. Set NetworkManager to start at boot
1. Install GRUB in both legacy and UEFI modes

View File

@ -32,7 +32,7 @@ impl<'a> ALMA<'a> {
info!("Mounting filesystems to {}", path.display());
mount_stack
.mount(&root_device, path, Filesystem::Btrfs, None)
.mount(&root_device, path, Filesystem::Ext4, None)
.context(ErrorKind::Mounting)?;
let boot_point = path.join("boot");

View File

@ -107,7 +107,7 @@ fn create(command: CreateCommand) -> Result<(), Error> {
let arch_chroot = Tool::find("arch-chroot")?;
let genfstab = Tool::find("genfstab")?;
let mkfat = Tool::find("mkfs.fat")?;
let mkbtrfs = Tool::find("mkfs.btrfs")?;
let mkext4 = Tool::find("mkfs.ext4")?;
let cryptsetup = if command.encrypted_root {
Some(Tool::find("cryptsetup")?)
} else {
@ -163,9 +163,9 @@ fn create(command: CreateCommand) -> Result<(), Error> {
None
};
mkbtrfs
mkext4
.execute()
.arg("-f")
.arg("-F")
.arg(if let Some(device) = &encrypted_root {
device.path()
} else {
@ -186,7 +186,6 @@ fn create(command: CreateCommand) -> Result<(), Error> {
"efibootmgr",
"intel-ucode",
"networkmanager",
"btrfs-progs",
"broadcom-wl",
]).args(&command.extra_packages)
.run(ErrorKind::Pacstrap)?;

View File

@ -8,14 +8,14 @@ use std::path::Path;
#[derive(Debug)]
pub enum Filesystem {
Btrfs,
Ext4,
Vfat,
}
impl Filesystem {
fn to_type(&self) -> &'static str {
match self {
Filesystem::Btrfs => "btrfs",
Filesystem::Ext4 => "ext4",
Filesystem::Vfat => "vfat",
}
}