various fixes and initial focal support

[automated-distro-installer] / fai / config / distro-install-common / end

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 1fd8ca6a778cfcba6bb13c0d3ffc9ceba67be740..e764c32ea67367e21a887e518926694071f999d3 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -19,14 +19,10 @@ if [[ -e $src && -e $dst ]]; then
 fi
 
 USER2PW=/q/root/shadow/user2
-if ifclass ziva; then
-  ROOTPW=/q/root/shadow/ziva
-else
-  # if doesn't exist, we dont set one
-  ROOTPW=/q/root/shadow/standard
-  if [[ ! -e $ROOTPW ]]; then
-    ROOTPW=/q/root/shadow/$HOSTNAME
-  fi
+# if doesn't exist, we dont set one
+ROOTPW=/q/root/shadow/standard
+if [[ ! -e $ROOTPW ]]; then
+  ROOTPW=/q/root/shadow/$HOSTNAME
 fi
 
 chpw() {