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

Fix outdated config names

Browse source
This commit is contained in:
Manuel Thalmann 2024-12-07 21:46:53 +01:00
parent d0dbae683d
commit 2a8d4dc805
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,12 +10,12 @@ begin
end end
function bootstrapSetup -S function bootstrapSetup -S
pacstrap -K (getOSConfig partition.rootDir) fish pacstrap -K (getOSConfig fileSystems.rootDir) fish
end end
function installDrivers -S function installDrivers -S
if isOSEnabled hardware.surfaceBook if isOSEnabled hardware.surfaceBook
pacstrap -K (getOSConfig partition.rootDir) linux-firmware-marvell pacstrap -K (getOSConfig fileSystems.rootDir) linux-firmware-marvell
end end
end end
@ -26,7 +26,7 @@ begin
function initOS -V dir function initOS -V dir
source "$dir/../lib/dependencies.fish" source "$dir/../lib/dependencies.fish"
source "$dir/../../lib/wait-network.fish" source "$dir/../../lib/wait-network.fish"
set -l mountDir (getOSConfig partition.rootDir) set -l mountDir (getOSConfig fileSystems.rootDir)
waitNetwork waitNetwork
and pacman-key --init and pacman-key --init
@ -47,7 +47,7 @@ begin
function setupOS -S -V dir -S function setupOS -S -V dir -S
source "$dir/../../lib/hooks.fish" source "$dir/../../lib/hooks.fish"
source "$dir/../../lib/wait-network.fish" source "$dir/../../lib/wait-network.fish"
set -l mountDir (getOSConfig partition.rootDir) set -l mountDir (getOSConfig fileSystems.rootDir)
waitNetwork waitNetwork
and begin and begin
@ -108,7 +108,7 @@ begin
end end
function autologin -S function autologin -S
set -l mountDir (getOSConfig partition.rootDir) set -l mountDir (getOSConfig fileSystems.rootDir)
set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf" set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
arch-chroot "$mountDir" mkdir -p (dirname "$file") arch-chroot "$mountDir" mkdir -p (dirname "$file")

4
scripts/Common/OS/setup.fish
View file

@ -11,7 +11,7 @@ function runSetup
source "$dir/../../lib/nix.fish" source "$dir/../../lib/nix.fish"
source "$dir/../../lib/restoration.fish" source "$dir/../../lib/restoration.fish"
source "$dir/../../lib/settings.fish" source "$dir/../../lib/settings.fish"
set -l mountDir (getOSConfig partition.rootDir) set -l mountDir (getOSConfig fileSystems.rootDir)
if not type -q runChroot if not type -q runChroot
function runChroot -S function runChroot -S
@ -45,7 +45,7 @@ function runSetup
begin begin
set -l script (mktemp) set -l script (mktemp)
chmod +x "$script" chmod +x "$script"
and getOSConfig partition.script >"$script" and getOSConfig fileSystems.script >"$script"
and "$script" and "$script"
and rm "$script" and rm "$script"
end end