From 451b5868a12d3d49fb68ffaee4b567a7aca964b7 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Sun, 17 Dec 2017 16:42:08 -0700
Subject: [PATCH] Updated services

---
 .../etc/systemd/system/display-manager.service |  1 -
 .../getty.target.wants/getty@tty1.service      |  1 -
 .../NetworkManager.service                     |  0
 .../multi-user.target.wants/rngd.service       |  0
 .../multi-user.target.wants/sshd.service       |  0
 .../system/multi-user.target.wants/ufw.service |  0
 .../usr/local/bin/mount-all-volumes-foh        |  0
 Build Linux                                    | 18 ++++++++----------
 8 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 .linux_items/include/live/airootfs/etc/systemd/system/display-manager.service
 delete mode 100644 .linux_items/include/live/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service
 mode change 100644 => 120000 .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
 mode change 100644 => 120000 .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
 mode change 100644 => 120000 .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
 mode change 100644 => 120000 .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
 mode change 100755 => 120000 .linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh

diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/display-manager.service b/.linux_items/include/live/airootfs/etc/systemd/system/display-manager.service
deleted file mode 100644
index 5595cea3..00000000
--- a/.linux_items/include/live/airootfs/etc/systemd/system/display-manager.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/lightdm.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service b/.linux_items/include/live/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service
deleted file mode 100644
index 7bfe0808..00000000
--- a/.linux_items/include/live/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/getty@.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
deleted file mode 100644
index e874a9b3..00000000
--- a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/NetworkManager.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
new file mode 120000
index 00000000..e874a9b3
--- /dev/null
+++ b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/NetworkManager.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
deleted file mode 100644
index 5f6432cf..00000000
--- a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/rngd.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
new file mode 120000
index 00000000..5f6432cf
--- /dev/null
+++ b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/rngd.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
deleted file mode 100644
index d21ebd9d..00000000
--- a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/sshd.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
new file mode 120000
index 00000000..d21ebd9d
--- /dev/null
+++ b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/sshd.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
deleted file mode 100644
index 86a21504..00000000
--- a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/ufw.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
new file mode 120000
index 00000000..86a21504
--- /dev/null
+++ b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/ufw.service
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh b/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh
deleted file mode 100755
index 8ac53b0c..00000000
--- a/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh
+++ /dev/null
@@ -1 +0,0 @@
-mount-all-volumes
\ No newline at end of file
diff --git a/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh b/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh
new file mode 120000
index 00000000..8ac53b0c
--- /dev/null
+++ b/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh
@@ -0,0 +1 @@
+mount-all-volumes
\ No newline at end of file
diff --git a/Build Linux b/Build Linux
index 37861a0d..4c372daa 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -92,7 +92,7 @@ function load_settings() {
     done < "$BUILD_DIR/main.py"
 }
 
-function prep_live_env() {
+function copy_live_env() {
     echo "Copying Archlinux files..."
     rsync -aI /usr/share/archiso/configs/releng/ "$LIVE_DIR/"
     
@@ -121,7 +121,7 @@ function run_elevated() {
     fi
 }
 
-function update_archlive() {
+function update_live_env() {
     hostname="$(echo "${KIT_NAME_SHORT}-linux" | tr "[:upper:]" "[:lower:]")"
     username="$(echo "${KIT_NAME_SHORT}tech" | tr "[:upper:]" "[:lower:]")"
     
@@ -156,13 +156,11 @@ function update_archlive() {
     
     # Openbox theme
     git clone --depth=1 git@github.com:addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes"
-    cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$LIVE_DIR/airootfs/usr/share/themes/"
+    cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$LIVE_DIR/airootfs/usr/share/themes/Triste-Orange"
 
     # Services
     sed -i -r 's/^(.*pacman-init.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
     sed -i -r 's/^(.*choose-mirror.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
-    ln -s /usr/lib/systemd/system/NetworkManager.service /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
-    ln -s /usr/lib/systemd/system/NetworkManager-dispatcher.service /etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
     
     # SSH
     mkdir -p "$SKEL_DIR/.ssh"
@@ -184,7 +182,7 @@ function update_archlive() {
 
     # Tech user autologin
     mkdir -p "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d"
-    echo "[Service]" >> "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf"
+    echo "[Service]" > "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf"
     echo "ExecStart=" >> "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf"
     echo "ExecStart=-/sbin/agetty --autologin $username --noclear %I 38400 linux" >> "$LIVE_DIR/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf"
 
@@ -285,8 +283,8 @@ function build_full() {
     install_deps
     load_settings
     update_repo
-    prep_live_env
-    update_archlive
+    copy_live_env
+    update_live_env
     # Rerun script as root to start Archiso build process
     run_elevated "$(realpath "$0")" --build-iso
 }
@@ -312,8 +310,8 @@ case $1 in
     
     -p|--prep-live-env)
         load_settings
-        prep_live_env
-        update_archlive
+        copy_live_env
+        update_live_env
         ;;
 
     -u|--update-repo)