/!\ Big Merge REBASING

This commit is contained in:
archikid02
2026-01-28 18:08:10 +00:00
parent 4ad36f5cf8
commit 78fd3d03c2
17 changed files with 261 additions and 35 deletions
+2
View File
@@ -12,6 +12,8 @@ apk add whois
apk add nmap
apk add man-db
apk add vim
apk add iproute2
apk add gitea
apk add git-filter-repo
+2
View File
@@ -9,6 +9,8 @@ chmod -R 771 $MACHINE_DIR/install
chmod -R 771 $BIN_DIR
chmod -R 751 $SBIN_DIR
find $MACHINE_DIR -type d -exec chmod 775 {} \;
chown root:root /etc/pam.d/*
chmod 644 /etc/pam.d/*
exit 0
+4
View File
@@ -9,3 +9,7 @@ USR_DIR=$(realpath $USR_DIR)
#uses ssymbolic link otherwise crossdevice troubles
cp -s -p -r -f -t / $USR_DIR/.
sudo chown root:root /
sudo chown root:root /etc /var /run /dev /usr /sys
sudo chmod 755 / /etc /var /usr
+38 -7
View File
@@ -1,16 +1,26 @@
#Make crash archinstall
8.8.8.8
70.27.250.39
94.105.98.61
129.97.134.71
185.21.134.11
159.195.6.177
172.65.90.7
193.121.15.225
34.0.0.0/8
35.0.0.0/8
#OVH
37.59.32.0/19
#Hetzner (arch install)
46.62.192.0/22
#Microsoft
#40.114.177.156 -> lilie.duckdns.org, holland
40.96.0.0/12
#Hetzner (arch install)
46.62.192.0/22
#Staples us (arch install)
50.74.152.24/29
@@ -18,14 +28,35 @@
95.216.0.0/16
#NETBLK Cox
#98.174.32.0/19
#OVH
#37.59.32.0/19
98.174.32.0/19
#Cloud flare chatgpt
#104.16.0.0/12
#oman#mobile
134.0.192.0/20
#cloudflare eu (arch install)
# RIPE
# http addr
141.0.0.0/8
#Google
142.250.0.0/15
#Fastly ip geolocalisation (arch install)
146.75.0.0/20
#SKYCA-3#Owner:Fastly
#pip atproto ?
151.101.0.0/16
#OVH france
188.165.192.0/18
#Amsterdam, possiblement a Linz il y a quelques annees
193.0.0.0/20
#oman#mobile
#134.0.192.0/20
+65 -10
View File
@@ -1,15 +1,65 @@
#Paypal
151.101.129.21
34.107.221.82
#sigmanet#codium
178.238.223.0/24
#gititea
34.217.253.146
#local
10.0.0.0/8
192.168.0.0/8
#microsoft (github)
#20.0.0.0/11
#winamax
34.96.80.159
#Paypal
#34.107.221.82
#ipinfo.io
34.117.59.81
#ifconfig.me
34.160.111.145
#plufinfirefox
34.120.208.123
#gitea
34.217.253.146
35.91.213.186
#dns
66.28.0.61
#Thesuissbay
85.195.200.187
#ChatGpt
104.18.32.47
#lb.ludd.ltu.se #mirror
130.240.16.130
#ch.mirrors.cicku.me
141.101.90.119
#Paypal
151.101.129.21
#paiement infomaniak
151.101.38.4
#dl-cdn.alpinelinux.org
151.101.10.132
#plugin firefox
151.101.193.91
151.101.129.91
151.101.205.91
#sigmanet#codium
178.238.223.0/24
#infania pacman repo
#ftpmirror.infania.net
194.132.225.213
#whois
199.212.0.0/24
@@ -19,9 +69,10 @@
#GitHub
185.199.111.0/24
#ChatGpt
104.18.32.47
#dns
209.244.0.3
<<<<<<< HEAD
#ipinfo.io
34.117.59.81
@@ -94,3 +145,7 @@
#
##dns
#209.244.0.3
#debian
146.75.0.0/20
199.232.0.0/16
+10 -3
View File
@@ -39,6 +39,7 @@ echo "iso = $ISO"
qemu-system-x86_64 \
-m $RAM \
<<<<<<< HEAD
-boot once=d \
-cdrom $ISO \
-drive file=$IMG \
@@ -50,10 +51,16 @@ qemu-system-x86_64 \
>>>>>>> 21c5e40 (alpine-qemu-install trying to run as non graphical)
-nic user,hostfwd=tcp::2222-:22 \
-device virtio-vga \
=======
-boot d \
-cdrom $ISO \
-drive file=$IMG,if=virtio \
>>>>>>> d378d2f ( /!\ Big Merge REBASING)
-enable-kvm \
-display default,show-cursor=on \
-display none \
-virtfs local,id=share,path="$SHARE",security_model=none,mount_tag=hostshare
-net nic \
-net user,hostfwd=tcp::7777-:22
#-virtfs local,id=share,path="$SHARE",security_model=none,mount_tag=hostshare
## --- Run QEMU with graphics + shared folder ---
#qemu-system-x86_64 \
+60
View File
@@ -0,0 +1,60 @@
#!/usr/bin/env bash
set -euo pipefail
SDX="${1:-sdb}"
BOOT="${SDX}1"
ROOT="${SDX}2"
if [[ "$(id -u)" -ne 0 ]]; then
echo "Run as root."
echo "sdx as parameter"
exit 1
fi
echo "Target: /dev/${SDX}"
read -rp "Proceed? (y/N) " yn
[[ "${yn,,}" == "y" ]] || exit 0
# wipe partitions
fdisk /dev/"${SDX}" <<EOF
o
n
p
1
+1G
t
c
n
p
2
w
EOF
# format
mkfs.vfat /dev/"${BOOT}"
mkfs.ext4 /dev/"${ROOT}"
# mount
mkdir -p /mnt/boot /mnt/root
mount /dev/"${BOOT}" /mnt/boot
mount /dev/"${ROOT}" /mnt/root
# download + extract
cd /mnt/root
wget -q http://os.archlinuxarm.org/os/ArchLinuxARM-rpi-armv7-latest.tar.gz
bsdtar -xpf ArchLinuxARM-rpi-armv7-latest.tar.gz -C /mnt/root
sync
# move boot files
mv /mnt/root/boot/* /mnt/boot/
# cleanup
#umount /mnt/boot /mnt/root
#rm -rf /mnt/boot /mnt/root
echo "Done. Insert SD card and boot the Pi."
+36
View File
@@ -0,0 +1,36 @@
#!/bin/bash
set -eux
# from vm to make a shared folder
if [ $# -lt 1 ] ; then
echo """
"""
echo "cheat sheet: mount -t 9p -o trans=virtio hostshare /mnt"
exit 1
fi
# --- Configurable defaults ---
IMG=${1:-disc_alpine.qcow2}
SSH=${2:-2222}
SHARE=${3:-$PWD/shared}
CPUS=${4:-2}
SIZE=${5:-16G}
RAM=${6:-2G}
# --- Setup ---
mkdir -p "$SHARE"
# --- Optional install script ---
# Drop any file named install.sh in ./share to execute it inside the VM later:
# e.g. `bash /mnt/share/install.sh` after mounting
qemu-system-x86_64 \
-m $RAM \
-boot once=d \
-drive file=$IMG \
-enable-kvm \
-display spice-app,show-cursor=on \
-nic user,hostfwd=tcp::"${SSH}"-:22
@@ -4,11 +4,13 @@ set -eux
# from vm to make a shared folder
if [ $# -lt 1 ] ; then
echo """
IMG=${1:-disc_alpine.qcow2}
SIZE=${2:-16G}
RAM=${3:-2G}
CPUS=${4:-2}
SHARE=${5:-$PWD/share}
IMG=${1:-disc_alpine.qcow2}
SSH=${2:2223}
SHARE=${3:-$PWD/share}
CPUS=${4:-2}
SIZE=${5:-16G}
RAM=${6:-2G}
GITEA=${7:-3000}
"""
echo "cheat sheet: mount -t 9p -o trans=virtio hostshare /mnt"
exit 1
@@ -16,10 +18,12 @@ fi
# --- Configurable defaults ---
IMG=${1:-disc_alpine.qcow2}
SIZE=${2:-16G}
RAM=${3:-2G}
SSH=${2:-2223}
SHARE=${3:-$PWD/share}
CPUS=${4:-2}
SHARE=${5:-$PWD/share}
SIZE=${5:-16G}
RAM=${6:-2G}
GITEA=${7:-3000}
# --- Setup ---
mkdir -p "$SHARE"
@@ -37,6 +41,6 @@ qemu-system-x86_64 \
-device virtio-vga \
-enable-kvm \
-display default,show-cursor=on \
-nic user,hostfwd=tcp::2222-:22 \
-nic user,hostfwd=tcp::"${SSH}"-:22,hostfwd=tcp::"${GITEA}"-:3000 \
-virtfs local,id=share,path="$SHARE",security_model=none,mount_tag=hostshare
-1
View File
@@ -12,4 +12,3 @@ mount $DEV $MNT_PT
cd $MNT_PT
exit 0
+1
View File
@@ -1,3 +1,4 @@
#!/usr/bin/bash
ping -c1 9.9.9.9
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/bash
if [ "$#" -lt 1 ] || [ "$#" -gt 3 ]; then
echo "Usage: $0 arg1 [arg2] [arg3]"
exit 1
fi
VPS=${1:-"$IAMUTOPIST"}
USER=${2:-"root"}
VPS_PORT=${3:-"443"}
HOST_PORT=${4:-"3000"}
echo """
runs:
ssh -N -R $VPS_PORT:localhost:$HOST_PORT $USER@$VPS
"""
ssh -N -R $VPS_PORT:localhost:$HOST_PORT $USER@$VPS
+1
View File
@@ -13,6 +13,7 @@ LOG_CONN_DIR=/var/log/tcpd
LOG_CONN=$LOG_CONN_DIR/lasts.log
NET_STATUS=/tmp/status.txt
SSH=177
IAMUTOPIST=128.65.199.189
JOURNAL_DIR=$HOME/journal
PERSO_DIR=$HOME/perso
-5
View File
@@ -1,13 +1,8 @@
#%PAM-1.0
auth requisite pam_nologin.so
auth include system-local-login
auth optional pam_gnome_keyring.so
account include system-local-login
session include system-local-login
session optional pam_gnome_keyring.so auto_start
password include system-local-login
+6
View File
@@ -0,0 +1,6 @@
#%PAM-1.0
auth required pam_unix.so try_first_pass
account required pam_unix.so
password required pam_unix.so
session required pam_unix.so
+2
View File
@@ -3,3 +3,5 @@ nameserver 0.0.0.0
nameserver 8.26.56.26
nameserver 208.67.222.222
nameserver 209.244.0.3
nameserver 8.8.8.8
Regular → Executable
+3
View File
@@ -1,3 +1,4 @@
<<<<<<< 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
@@ -42,3 +43,5 @@ ReadEtcHosts=yes
#ResolveUnicastSingleLabel=no
#StaleRetentionSec=0
#RefuseRecordTypes=
=======
>>>>>>> d378d2f ( /!\ Big Merge REBASING)