From 0b66c379a0c7e6f619a133a613b7e61205d98cf1 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Mon, 26 Aug 2024 00:03:52 -0400
Subject: [PATCH] Only install ntp local service startup script on desktops

---
 chrootInstall.sh | 9 +++++----
 install.sh       | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/chrootInstall.sh b/chrootInstall.sh
index 8daa46c..5c80ef5 100755
--- a/chrootInstall.sh
+++ b/chrootInstall.sh
@@ -20,9 +20,6 @@ echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen
 echo 'LANG=en_US.UTF-8' > /etc/locale.conf
 ln -s "$timezone" /etc/localtime
 locale-gen
-curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/ntp-rclocal/20-ntp.start -o /etc/local.d/20-ntp.start
-chmod 755 /etc/local.d/20-ntp.start
-echo "0" > /etc/local.d/.ntpsync
 
 # networkmanager configuration 
 pacman -S networkmanager-openrc --noconfirm
@@ -105,9 +102,13 @@ fi
 # disable kernel watchdog
 echo 'blacklist iTCO_wdt' > /etc/modprobe.d/blacklist.conf
 
-# install powertop on laptops
+# install laptop/desktop specific content (powertop on laptops; ntp local service startup script on desktops)
 if [ "$formfactor" == 2 ] || [ "$formfactor" == 1 ]; then
     pacman -S powertop --needed --noconfirm
+else
+    curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/ntp-rclocal/20-ntp.start -o /etc/local.d/20-ntp.start
+    chmod 755 /etc/local.d/20-ntp.start
+    echo "0" > /etc/local.d/.ntpsync
 fi
 
 # set home directory permissions
diff --git a/install.sh b/install.sh
index 44de4e2..1f121f0 100755
--- a/install.sh
+++ b/install.sh
@@ -3,14 +3,14 @@
 loadkeys us
 echo ----------------------------------------------------------------------------------------------
 echo rwinkhart\'s Artix Install Script
-echo last updated August 26, 2024 \(rev. A\)
+echo last updated August 26, 2024 \(rev. B\)
 echo ----------------------------------------------------------------------------------------------
 echo You will be asked some questions before installation.
 echo -e "----------------------------------------------------------------------------------------------\n"
 read -n 1 -s -r -p 'Press any key to continue'
 
 # start simple questions
-echo -e '\nSpecial devices:\n1. ASUS Zephyrus G14 (2020)\nGeneric:\n2. Laptop\n3. Desktop\n4. Headless\n'
+echo -e '\nSpecial devices:\n1. ASUS Zephyrus G14 (2020)\nGeneric:\n2. Laptop\n3. Desktop\n4. Headless desktop\n'
 read -n 1 -r -p "Formfactor: " formfactor
 
 echo -e "\n"