manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Inherit mountDir from setup script

Browse source
This commit is contained in:
Manuel Thalmann 2024-09-30 14:56:49 +02:00
parent 8bd4cac747
commit 69cbbf9834
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/Arch/OS/setup.fish
View file

@ -4,17 +4,15 @@ begin
source "$dir/../../Common/OS/setup.fish" source "$dir/../../Common/OS/setup.fish"
source "$dir/../../Common/Scripts/config.fish" source "$dir/../../Common/Scripts/config.fish"
set -l mountDir (getOSConfig partition.rootDir)
function runChroot -S function runChroot -S
arch-chroot $argv arch-chroot $argv
end end
function installValhallaDeps -V mountDir function installValhallaDeps -S
pacstrap -K "$mountDir" fish git jq nix sudo tmux pacstrap -K "$mountDir" fish git jq nix sudo tmux
end end
function installDrivers -V mountDir function installDrivers -S
if isOSEnabled hardware.surfaceBook if isOSEnabled hardware.surfaceBook
pacstrap -K "$mountDir" linux-firmware-marvell; pacstrap -K "$mountDir" linux-firmware-marvell;
end end
@ -24,7 +22,7 @@ begin
echo "$dir/install.fish" echo "$dir/install.fish"
end end
function setupOS -S -V dir -V mountDir function setupOS -S -V dir -S
source "$dir/../../Common/Scripts/hooks.fish" source "$dir/../../Common/Scripts/hooks.fish"
source "$dir/../../Common/Scripts/wait-network.fish" source "$dir/../../Common/Scripts/wait-network.fish"