Merge branch 'main' into dev

This commit is contained in:
Manuel Thalmann 2024-10-31 21:56:14 +01:00
commit c364b53d33
4 changed files with 8 additions and 7 deletions

View file

@ -0,0 +1 @@
/usr/lib/systemd/system/cloud-init-main.service

View file

@ -0,0 +1 @@
/usr/lib/systemd/system/cloud-init-network.service

View file

@ -34,7 +34,6 @@ fish
foot-terminfo foot-terminfo
fsarchiver fsarchiver
git git
gnu-netcat
gpart gpart
gpm gpm
gptfdisk gptfdisk

View file

@ -1,5 +1,5 @@
diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
index bf6bc8f..0c263a9 100644 index bf6bc8f..bdbe55c 100644
--- a/airootfs/root/.zlogin --- a/airootfs/root/.zlogin
+++ b/airootfs/root/.zlogin +++ b/airootfs/root/.zlogin
@@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then @@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
@ -12,7 +12,7 @@ index bf6bc8f..0c263a9 100644
+ cat /sys/class/backlight/*/max_brightness > /sys/class/backlight/*/brightness + cat /sys/class/backlight/*/max_brightness > /sys/class/backlight/*/brightness
+fi +fi
+ +
+cd "PortValhalla" +cd "/root/PortValhalla" || exit
+ +
+git diff -p -R --no-ext-diff --no-color --diff-filter=M \ +git diff -p -R --no-ext-diff --no-color --diff-filter=M \
+ | grep -E "^(diff|(old|new) mode)" --color=never \ + | grep -E "^(diff|(old|new) mode)" --color=never \
@ -22,7 +22,7 @@ index bf6bc8f..0c263a9 100644
+loadkeys de_CH-latin1 +loadkeys de_CH-latin1
+./scripts/Arch/OS/setup.fish +./scripts/Arch/OS/setup.fish
diff --git a/packages.x86_64 b/packages.x86_64 diff --git a/packages.x86_64 b/packages.x86_64
index 724adbf..01cd2a0 100644 index 1e9a752..b807634 100644
--- a/packages.x86_64 --- a/packages.x86_64
+++ b/packages.x86_64 +++ b/packages.x86_64
@@ -30,8 +30,10 @@ ethtool @@ -30,8 +30,10 @@ ethtool
@ -33,10 +33,10 @@ index 724adbf..01cd2a0 100644
foot-terminfo foot-terminfo
fsarchiver fsarchiver
+git +git
gnu-netcat
gpart gpart
gpm gpm
@@ -45,6 +47,7 @@ irssi gptfdisk
@@ -44,6 +46,7 @@ irssi
iw iw
iwd iwd
jfsutils jfsutils
@ -44,7 +44,7 @@ index 724adbf..01cd2a0 100644
kitty-terminfo kitty-terminfo
ldns ldns
less less
@@ -75,6 +78,7 @@ nbd @@ -74,6 +77,7 @@ nbd
ndisc6 ndisc6
nfs-utils nfs-utils
nilfs-utils nilfs-utils