all files written as modified, but git diff is empty

This commit is contained in:
painpain@minty
2026-02-02 17:41:02 +01:00
parent 9f732f3333
commit dc374ab7b4
9 changed files with 34 additions and 148 deletions
+1
View File
@@ -39,6 +39,7 @@ echo "iso = $ISO"
qemu-system-x86_64 \
-m $RAM \
-nic user \
-boot once=d \
-cdrom $ISO \
-drive file=$IMG \
+2 -2
View File
@@ -1,14 +1,14 @@
#!/bin/bash
clone ()
{
DEFAULT_ADDR=""
BASE="ssh://git@6.tcp.eu.ngrok.io:11272"
URL=ssh://git@6.tcp.eu.ngrok.io:11272
if [ $# -ne "1" ]; then
PROFIL_NAME="$1";
PROJECT_NAME="$2";
else
PROFIL_NAME="painpain";
PROJECT_NAME="$1";
git clone --recurse-submodules git@github.com:pain-pin/$PROJECT_NAME.git;
fi
git clone --recurse-submodules ${BASE}/$PROFIL_NAME/$PROJECT_NAME.git;
}
+3 -1
View File
@@ -1,4 +1,6 @@
#!/usr/bin/bash
ping -c1 9.9.9.9
ping -c1 | grep transmit
exit 0
+3 -6
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
# This file is part of systemd. -> systemctl enable --now systemd-resolved
#
# systemd is free software; you can redistribute it and/or modify it under the
@@ -19,9 +18,9 @@
[Resolve]
# Some examples of DNS servers which may be used for DNS= and FallbackDNS=:
DNS=1.1.1.1 2606:4700:4700::1111 2606:4700:4700::1001
DNS=1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 #cloudflare-dns.com
# Quad9: 9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
FallbackDNS=185.253.5.0 2a0f:fc80:: 2a0f:fc81::
FallbackDNS=193.110.81.0 185.253.5.0 2a0f:fc80:: 2a0f:fc81:: #dns0.eu
#
# Using DNS= configures global DNS servers and does not suppress link-specific
# configuration. Parallel requests will be sent to per-link DNS servers
@@ -31,7 +30,7 @@ FallbackDNS=185.253.5.0 2a0f:fc80:: 2a0f:fc81::
#DNS=
#FallbackDNS=9.9.9.9#dns.quad9.net 2620:fe::9#dns.quad9.net 1.1.1.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 8.8.8.8#dns.google 2001:4860:4860::8888#dns.google
#Domains=
DNSSEC=allow-downgrade
DNSSEC=yes
DNSOverTLS=yes
MulticastDNS=yes
LLMNR=yes
@@ -43,5 +42,3 @@ ReadEtcHosts=yes
#ResolveUnicastSingleLabel=no
#StaleRetentionSec=0
#RefuseRecordTypes=
=======
>>>>>>> d378d2f ( /!\ Big Merge REBASING)