fixes
This commit is contained in:
parent
135236685a
commit
379927dfe0
2 changed files with 9 additions and 13 deletions
|
@ -9,20 +9,16 @@
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
ESP = {
|
grub_mbr = {
|
||||||
priority = 1;
|
size = "1M";
|
||||||
name = "efi";
|
type = "EF02"; # for grub MBR
|
||||||
start = "1M";
|
};
|
||||||
end = "1024M";
|
boot = {
|
||||||
type = "EF00";
|
size = "1G";
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "vfat";
|
format = "ext4";
|
||||||
mountpoint = "/boot";
|
mountpoint = "/boot";
|
||||||
mountOptions = [
|
|
||||||
"umask=0077"
|
|
||||||
"noatime"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
root = {
|
root = {
|
||||||
|
|
|
@ -125,7 +125,7 @@ ensure_confirmation() {
|
||||||
|
|
||||||
partition_disk() {
|
partition_disk() {
|
||||||
if [ "$DOTNIX_CONFIRM_DISK_NUKE" = "yes" ]; then
|
if [ "$DOTNIX_CONFIRM_DISK_NUKE" = "yes" ]; then
|
||||||
sudo nix run github:nix-community/disko/latest -- --mode destroy,format,mount "./hosts/$DOTNIX_HOSTNAME/disko.nix"
|
sudo nix run github:nix-community/disko/latest -- --mode destroy,format,mount --yes-wipe-all-disks "./hosts/$DOTNIX_HOSTNAME/disko.nix"
|
||||||
else
|
else
|
||||||
>&2 echo "Aborted installation due to invalid state in the partitioning step."
|
>&2 echo "Aborted installation due to invalid state in the partitioning step."
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -154,7 +154,7 @@ main () {
|
||||||
partition_disk
|
partition_disk
|
||||||
generate_config
|
generate_config
|
||||||
|
|
||||||
# todo run the install
|
# todo install
|
||||||
}
|
}
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
Loading…
Add table
Reference in a new issue