aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-09-20 22:06:57 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2022-09-20 22:07:20 +0200
commitf8eb04d9f2106aacfd98cb2b5f2d6c0870cce7d3 (patch)
tree3ce0be59803ff9fd6980218cd94f5b357bdb5e16
parentfre 16 sep 2022 12:57:09 CEST (diff)
parenttis 20 sep 2022 18:04:47 CEST (diff)
downloadwiki-public-f8eb04d9f2106aacfd98cb2b5f2d6c0870cce7d3.tar.gz
wiki-public-f8eb04d9f2106aacfd98cb2b5f2d6c0870cce7d3.tar.xz
tis 20 sep 2022 22:07:23 CEST
-rw-r--r--Media.wiki1
-rw-r--r--Systemd Machined.wiki2
-rw-r--r--Västgöta/veckomail.wiki6
-rw-r--r--Västgöta/veckomail/2022/37.wiki1
-rw-r--r--nspawn.wiki4
-rwxr-xr-xwiki8
6 files changed, 16 insertions, 6 deletions
diff --git a/Media.wiki b/Media.wiki
index 0bbe60e..abe89a8 100644
--- a/Media.wiki
+++ b/Media.wiki
@@ -121,6 +121,7 @@ Teolog
- [-] openTTD
- [ ] Subnautica
- [ ] [[https://www.reddit.com/r/RogueLegacy/comments/8byxfk/free_rogue_legacy_mod_the_lament_of_zors_a/|Lament of Zors - Rogue Legacy MOD]]
+- [ ] Supreme Commander
=== GBA ===
- [ ] Samurai Jack
diff --git a/Systemd Machined.wiki b/Systemd Machined.wiki
index bad1b79..9389132 100644
--- a/Systemd Machined.wiki
+++ b/Systemd Machined.wiki
@@ -1,3 +1,5 @@
+[[nspawn]]
+
systemd.nspawn(5)
/etc/systemd/nspawn/*.nspawn
diff --git a/Västgöta/veckomail.wiki b/Västgöta/veckomail.wiki
index ccc42f0..a0f778b 100644
--- a/Västgöta/veckomail.wiki
+++ b/Västgöta/veckomail.wiki
@@ -57,11 +57,15 @@
[[veckomail/2022/35]]
[[veckomail/2022/36]]
[[veckomail/2022/37]]
+[[veckomail/2022/38]]
= Kommande datum =
-2022-05-29 :: 29 Maj
+2022-09-24 :: Häfv-VM
+2022-10-01 :: Sensommarblotet, en kräftskiva
+2022-10-20 :: Höstmöte
+2022-12-03 :: Midvinterblotet
= Veckomail v.`date +%V` =
diff --git a/Västgöta/veckomail/2022/37.wiki b/Västgöta/veckomail/2022/37.wiki
index 4e7ca21..02295b0 100644
--- a/Västgöta/veckomail/2022/37.wiki
+++ b/Västgöta/veckomail/2022/37.wiki
@@ -21,4 +21,3 @@ september kommer vi stå på campus. Kontakta pq@vastgota.nation.liu.se
= Kommande Datum =
2022-09-24 :: Häfv-VM
-
diff --git a/nspawn.wiki b/nspawn.wiki
index b7aeb31..3a805e6 100644
--- a/nspawn.wiki
+++ b/nspawn.wiki
@@ -1,9 +1,11 @@
+[[Systemd Machined]]
+
== Debian ==
=== Create new debian container ===
{{{
-debootstrap bullseye /var/lib/machines/<machine-name>
+debootstrap --include=systemd-container bullseye /var/lib/machines/<machine-name>
systemd-nspawn -M <machine-name> apt install systemd-container
}}}
diff --git a/wiki b/wiki
index 9ce12f7..c89228d 100755
--- a/wiki
+++ b/wiki
@@ -8,6 +8,8 @@ WIKI_LIST=$(ls $WIKIROOT | grep -v html)
wiki_list=""
+alias git='git -c color.status=always'
+
#
# Adds all files to git, and commits with either the arguments as
# message, or with the current time as the message.
@@ -62,7 +64,7 @@ function wiki_do {
echo "-- $wiki --"
;;
*)
- eval "git $@"
+ eval "git -c color.status=always $@"
;;
esac
}
@@ -120,8 +122,8 @@ fi
# Run given command for all wikis
for wiki in ${wiki_list:-$WIKI_LIST}; do
- echo "== $wiki =="
- wiki_do $wiki $@ &
+ wiki_do $wiki $@ | sed "s/^/$wiki /" &
done
+
wait