Revert "fai/config/scripts/EDU/50-cups-browsing: Assure that CreateRemoteCUPSPrinterQueues is set to 'Yes'."

This reverts commit c07b8a4e2dab01e1c5136167b62f3cf7907d42c7.

3 files changed, 3 insertions, 9 deletions

diff --git a/fai/config/class/10-base-classes b/fai/config/class/10-base-classes
index d312a50..3d03c8f 100755
--- a/fai/config/class/10-base-classes
+++ b/fai/config/class/10-base-classes
@@ -7,7 +7,7 @@ fi
 
 # Echo architecture and OS name in uppercase. Do NOT remove these two lines.
 uname -s | tr '[:lower:]' '[:upper:]'
-command -v dpkg >&/dev/null && dpkg --print-architecture | tr a-z A-Z
+[ -x "`which dpkg`" ] && dpkg --print-architecture | tr a-z A-Z
 
 # determin if we are a DHCP client or not
 # count the : chars in the argument of ip=
diff --git a/fai/config/class/20-hwdetect.sh b/fai/config/class/20-hwdetect.sh
index 57374c8..8ba48d4 100755
--- a/fai/config/class/20-hwdetect.sh
+++ b/fai/config/class/20-hwdetect.sh
@@ -20,8 +20,7 @@ for mod in $kernelmodules; do
     modprobe -a $mod 1>/dev/null 2>&1
 done
 
-# show the basic information about the network interface
-ip -br li show up|egrep -v ^lo; ip -br a show up|egrep -v ^lo
+ip ad show up | egrep -iv 'loopback|127.0.0.1|::1/128|_lft'
 
 echo $printk > /proc/sys/kernel/printk
 
@@ -33,3 +32,4 @@ if [ "$disklist" != "$odisklist" ]; then
 fi
 
 save_dmesg     # save new boot messages (from loading modules)
+
diff --git a/fai/config/scripts/EDU/50-cups-browsing b/fai/config/scripts/EDU/50-cups-browsing
index 6660da5..ee15657 100755
--- a/fai/config/scripts/EDU/50-cups-browsing
+++ b/fai/config/scripts/EDU/50-cups-browsing
@@ -6,12 +6,6 @@ ainsl /etc/cups/cups-browsed-debian-edu.conf "BrowseRemoteProtocols none" "^Brow
 # recent cups-browsed.conf files, have BrowseRemoteProtocols set to "dnssd cups", so let's change that
 sed -r -i $target/etc/cups/cups-browsed-debian-edu.conf -e "s/^BrowseRemoteProtocols\s+.*/BrowseRemoteProtocols none/"
 
-# for cases where CreateRemoteCUPSPrinterQueues is not set in cups-browsed.conf explicitly
-ainsl /etc/cups/cups-browsed-debian-edu.conf "CreateRemoteCUPSPrinterQueues Yes" "^CreateRemoteCUPSPrinterQueues\s+.*"
-
-# recent cups-browsed.conf files, have CreateRemoteCUPSPrinterQueues set to "No", but it should be "Yes"
-sed -r -i $target/etc/cups/cups-browsed-debian-edu.conf -e "s/^CreateRemoteCUPSPrinterQueues\s+.*/CreateRemoteCUPSPrinterQueues Yes/"
-
 ainsl /etc/cups/cups-browsed-debian-edu.conf "BrowseLocalProtocols none" "^BrowseLocalProtocols\s+.*"
 ainsl /etc/cups/cups-browsed-debian-edu.conf "LocalQueueNamingRemoteCUPS RemoteName" "^LocalQueueNamingRemoteCUPS\s+.*"
 ainsl /etc/cups/cups-browsed-debian-edu.conf "BrowsePoll ipp.intern" "^BrowsePoll\s+.*"