[rfs-stage32] Speed up mounting tmp-partition and setting up zram swap

1 files changed, 9 insertions, 9 deletions

diff --git a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
index 93287af8..546750b9 100755
--- a/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
+++ b/remote/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx
@@ -20,12 +20,12 @@
 . /opt/openslx/config
 
 RESOLV_CONF="/etc/resolv.conf"
-THIS_RESOLV="/run/udhcpc/${interface}.resolv"
+THIS_RESOLV="/run/dhcpc/${interface}.resolv"
 
 rebuild_resolv_conf () {
 	# Maybe make this smarter some time, if anyone is using client's that are on multiple networks at once etc...
 	# This is a little braindead but should work most of the time
-	sort -u /run/udhcpc/*.resolv > "$RESOLV_CONF" 2> /dev/null
+	sort -u /run/dhcpc/*.resolv > "$RESOLV_CONF" 2> /dev/null
 }
 
 escape_search() {
@@ -58,7 +58,7 @@ fi
 case "$1" in
 	bound|renew)
 		check_env "$1"
-		mkdir -p "/run/udhcpc"
+		mkdir -p "/run/dhcpc"
 		# Set address on interface
 		ip addr add "$ip/$(ipcalc -s -p $ip $subnet|sed s/.*=//)" dev "$interface"
 		# Set default route, if given
@@ -96,7 +96,7 @@ case "$1" in
 			sed -i "s/^\(SLX_PXE_CLIENT_IP=\).*$/\1'$ip'/" /opt/openslx/config
 			
 			# Only if network is not ready yet
-			if [ ! -e "/run/udhcpc/network-ready" ]; then
+			if [ ! -e "/run/dhcpc/network-ready" ]; then
 				# Update hostname
 				if [ -z "$dns_host" ]; then
 					# fallback to what the dhcp told us
@@ -130,7 +130,7 @@ case "$1" in
 				fi
 				# Update /etc/issue for proper spacing
 				/opt/openslx/scripts/openslx-create_issue
-				touch "/run/udhcpc/network-ready"
+				touch "/run/dhcpc/network-ready"
 				# Mark network target as reached
 				systemctl start network.target &
 			fi # end "network not ready yet"
@@ -158,16 +158,16 @@ case "$1" in
 		sed -i -r '/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\s*$/d' /etc/hosts
 		
 		# "dns ready" target
-		if [ -n "$dns" ] && [ ! -e "/run/udhcpc/dns-ready" ]; then
-			touch "/run/udhcpc/dns-ready"
+		if [ -n "$dns" ] && [ ! -e "/run/dhcpc/dns-ready" ]; then
+			touch "/run/dhcpc/dns-ready"
 			# Write to openslx-config
 			echo "# Config written by openslx-dhcp-script (2)" >> /opt/openslx/config
 			echo "SLX_DNS='$dns'" >> /opt/openslx/config
 			systemctl start network-dns.target &
 		fi
 		# "default route exists" target
-		if [ -n "$router" ] && [ ! -e "/run/udhcpc/routing-ready" ]; then
-			touch "/run/udhcpc/routing-ready"
+		if [ -n "$router" ] && [ ! -e "/run/dhcpc/routing-ready" ]; then
+			touch "/run/dhcpc/routing-ready"
 			# Write to openslx-config
 			echo "# Config written by openslx-dhcp-script (3)" >> /opt/openslx/config
 			echo "SLX_DNS='$dns'" >> /opt/openslx/config