Revert "install openrc companion packages for dhcpcd and wpa_supplicant"

This reverts commit 9bf73b77b8f29d0c79c13ab4ac60dc511e6972d1.

8 files changed, 8 insertions, 12 deletions

diff --git a/artixinstall b/artixinstall
index f0c3b62..884ac1f 100755
--- a/artixinstall
+++ b/artixinstall
@@ -67,6 +67,5 @@ umount -R /mnt
 
 echo -e "\n\e[1m\e[1;32mArtix has been successfully installed! It is now safe to reboot."
 echo -e "\e[1m\e[1;32mDon't forget to change the root password and hostname."
-echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed"
-echo -e "\e[1m\e[1;32mincluding their OpenRC companion packages."
+echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed."
 echo -en "\e[0m"
diff --git a/cryptinstall b/cryptinstall
index 3dab1a1..4471493 100755
--- a/cryptinstall
+++ b/cryptinstall
@@ -84,8 +84,7 @@ cryptsetup -q close root_crypt
 
 echo -e "\n\e[1m\e[1;32mArtix has been successfully installed! It is now safe to reboot."
 echo -e "\e[1m\e[1;32mDon't forget to change the root password, disk passwords and hostname."
-echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed"
-echo -e "\e[1m\e[1;32mincluding their OpenRC companion packages."
+echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed."
 echo -e "\n\e[1m\e[1;32mRun the following commands to change the disk passwords:"
 echo -e "\e[1m\e[1;32m\t# cryptsetup --pbkdf pbkdf2 luksChangeKey ${PART_PREFIX}1"
 echo -e "\e[1m\e[1;32m\t# cryptsetup luksChangeKey ${PART_PREFIX}2"
diff --git a/cryptuefiinstall b/cryptuefiinstall
index a661fb2..a271fd3 100755
--- a/cryptuefiinstall
+++ b/cryptuefiinstall
@@ -71,8 +71,7 @@ cryptsetup -q close data_crypt
 
 echo -e "\n\e[1m\e[1;32mArtix has been successfully installed! It is now safe to reboot."
 echo -e "\e[1m\e[1;32mDon't forget to change the root password, disk password and hostname."
-echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed"
-echo -e "\e[1m\e[1;32mincluding their OpenRC companion packages."
+echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed."
 echo -e "\n\e[1m\e[1;32mRun the following command to change the disk password:"
 echo -e "\e[1m\e[1;32m\t# cryptsetup luksChangeKey ${PART_PREFIX}2"
 echo -e "\n\e[1m\e[1;32mYour keyboard layout is preserved in the initramfs stage."
diff --git a/mkartix b/mkartix
index 3a459b9..94a68b1 100755
--- a/mkartix
+++ b/mkartix
@@ -58,7 +58,7 @@ EOT
 sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname
 
 ## Networking essentials
-pacman -S --noconfirm dhcpcd-openrc wpa_supplicant-openrc
+pacman -S --noconfirm dhcpcd wpa_supplicant
 
 # Repositories
 ## Artix
diff --git a/mkcryptartix b/mkcryptartix
index 3241a45..6c0adb1 100755
--- a/mkcryptartix
+++ b/mkcryptartix
@@ -105,7 +105,7 @@ EOT
 sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname
 
 ## Networking essentials
-pacman -S --noconfirm dhcpcd-openrc wpa_supplicant-openrc
+pacman -S --noconfirm dhcpcd wpa_supplicant
 
 # Repositories
 ## Artix
diff --git a/mkcryptuefi b/mkcryptuefi
index 9de1d16..1f6087c 100755
--- a/mkcryptuefi
+++ b/mkcryptuefi
@@ -89,7 +89,7 @@ EOT
 sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname
 
 ## Networking essentials
-pacman -S --noconfirm dhcpcd-openrc wpa_supplicant-openrc
+pacman -S --noconfirm dhcpcd wpa_supplicant
 
 # Repositories
 ## Artix
diff --git a/mkuefi b/mkuefi
index b8f0663..824cc21 100755
--- a/mkuefi
+++ b/mkuefi
@@ -86,7 +86,7 @@ EOT
 sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname
 
 ## Networking essentials
-pacman -S --noconfirm dhcpcd-openrc wpa_supplicant-openrc
+pacman -S --noconfirm dhcpcd wpa_supplicant
 
 # Repositories
 ## Artix
diff --git a/uefiinstall b/uefiinstall
index 760cfbb..616264e 100755
--- a/uefiinstall
+++ b/uefiinstall
@@ -58,6 +58,5 @@ umount -R /mnt
 
 echo -e "\n\e[1m\e[1;32mArtix has been successfully installed! It is now safe to reboot."
 echo -e "\e[1m\e[1;32mDon't forget to change the root password and hostname."
-echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed"
-echo -e "\e[1m\e[1;32mincluding their OpenRC companion packages."
+echo -e "\e[1m\e[1;32mSetting up networking is left to you, dhcpcd and wpa_supplicant are installed."
 echo -en "\e[0m"