From 715b2dda8c3549078089cb83f866e7d6920aa57c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 9 May 2021 21:43:01 +0200
Subject: [PATCH] fixes

---
 files/xorg/dbus-launch.sh                  | 3 +++
 step1/{30-users => 20-users}               | 0
 step1/{40-basesystem => 30-basesystem}     | 0
 step1/{50-bootloader => 40-bootloader}     | 0
 step1/{60-de => 50-de}                     | 0
 step1/{89-lastminute => 80-lastminute}     | 0
 step3/{20-installation => 10-installation} | 0
 step3/{40-basesystem => 20-basesystem}     | 0
 step3/{50-bootloader => 30-bootloader}     | 0
 step3/{60-de => 40-de}                     | 0
 step3/{89-lastminute => 80-lastminute}     | 0
 step4/{20-installation => 10-installation} | 0
 step4/{30-users => 20-users}               | 0
 step4/{40-basesystem => 30-basesystem}     | 0
 step4/{50-bootloader => 40-bootloader}     | 0
 15 files changed, 3 insertions(+)
 create mode 100644 files/xorg/dbus-launch.sh
 rename step1/{30-users => 20-users} (100%)
 rename step1/{40-basesystem => 30-basesystem} (100%)
 rename step1/{50-bootloader => 40-bootloader} (100%)
 rename step1/{60-de => 50-de} (100%)
 rename step1/{89-lastminute => 80-lastminute} (100%)
 rename step3/{20-installation => 10-installation} (100%)
 rename step3/{40-basesystem => 20-basesystem} (100%)
 rename step3/{50-bootloader => 30-bootloader} (100%)
 rename step3/{60-de => 40-de} (100%)
 rename step3/{89-lastminute => 80-lastminute} (100%)
 rename step4/{20-installation => 10-installation} (100%)
 rename step4/{30-users => 20-users} (100%)
 rename step4/{40-basesystem => 30-basesystem} (100%)
 rename step4/{50-bootloader => 40-bootloader} (100%)

diff --git a/files/xorg/dbus-launch.sh b/files/xorg/dbus-launch.sh
new file mode 100644
index 0000000..df5de97
--- /dev/null
+++ b/files/xorg/dbus-launch.sh
@@ -0,0 +1,3 @@
+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+	eval "$(dbus-launch --sh-syntax --exit-with-x11)"
+fi
\ No newline at end of file
diff --git a/step1/30-users b/step1/20-users
similarity index 100%
rename from step1/30-users
rename to step1/20-users
diff --git a/step1/40-basesystem b/step1/30-basesystem
similarity index 100%
rename from step1/40-basesystem
rename to step1/30-basesystem
diff --git a/step1/50-bootloader b/step1/40-bootloader
similarity index 100%
rename from step1/50-bootloader
rename to step1/40-bootloader
diff --git a/step1/60-de b/step1/50-de
similarity index 100%
rename from step1/60-de
rename to step1/50-de
diff --git a/step1/89-lastminute b/step1/80-lastminute
similarity index 100%
rename from step1/89-lastminute
rename to step1/80-lastminute
diff --git a/step3/20-installation b/step3/10-installation
similarity index 100%
rename from step3/20-installation
rename to step3/10-installation
diff --git a/step3/40-basesystem b/step3/20-basesystem
similarity index 100%
rename from step3/40-basesystem
rename to step3/20-basesystem
diff --git a/step3/50-bootloader b/step3/30-bootloader
similarity index 100%
rename from step3/50-bootloader
rename to step3/30-bootloader
diff --git a/step3/60-de b/step3/40-de
similarity index 100%
rename from step3/60-de
rename to step3/40-de
diff --git a/step3/89-lastminute b/step3/80-lastminute
similarity index 100%
rename from step3/89-lastminute
rename to step3/80-lastminute
diff --git a/step4/20-installation b/step4/10-installation
similarity index 100%
rename from step4/20-installation
rename to step4/10-installation
diff --git a/step4/30-users b/step4/20-users
similarity index 100%
rename from step4/30-users
rename to step4/20-users
diff --git a/step4/40-basesystem b/step4/30-basesystem
similarity index 100%
rename from step4/40-basesystem
rename to step4/30-basesystem
diff --git a/step4/50-bootloader b/step4/40-bootloader
similarity index 100%
rename from step4/50-bootloader
rename to step4/40-bootloader