From: Evgeni Golov <evgeni@debian.org>
Date: Sun, 19 Mar 2017 17:47:17 +0000 (+0100)
Subject: don't set a default password for altlinux, gentoo, openmandriva and pld
X-Git-Tag: lxc-2.1.0~175^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1474%2Fhead;p=thirdparty%2Flxc.git

don't set a default password for altlinux, gentoo, openmandriva and pld

Refs: #1158
Signed-off-by: Evgeni Golov <evgeni@debian.org>
---

diff --git a/templates/lxc-altlinux.in b/templates/lxc-altlinux.in
index 69c18d4ba..7accf2468 100644
--- a/templates/lxc-altlinux.in
+++ b/templates/lxc-altlinux.in
@@ -43,7 +43,6 @@ cache_base=@LOCALSTATEDIR@/cache/lxc/altlinux/$arch
 default_path=@LXCPATH@
 default_profile=default
 profile_dir=/etc/lxc/profiles
-root_password=rooter
 lxc_network_type=veth
 lxc_network_link=virbr0
 
@@ -156,8 +155,10 @@ EOF
     mkdir -m 755 ${dev_path}/net
     mknod -m 666 ${dev_path}/net/tun c 10 200
 
-    echo "setting root passwd to $root_password"
-    echo "root:$root_password" | chroot $rootfs_path chpasswd
+    if [ -n "${root_password}" ]; then
+        echo "setting root passwd to $root_password"
+        echo "root:$root_password" | chroot $rootfs_path chpasswd
+    fi
 
     return 0
 }
diff --git a/templates/lxc-gentoo.in b/templates/lxc-gentoo.in
index 2ad16e857..47f24d0d5 100644
--- a/templates/lxc-gentoo.in
+++ b/templates/lxc-gentoo.in
@@ -654,8 +654,6 @@ container_auth()
         printf "  => done. if you didn't specify , default is 'toor'\n"
         if [[ -n "${forced_password}" ]]; then
             store_user_message "${user} has the password you give for him"
-        else
-            store_user_message "${user} has the default password 'toor', please change it ASAP"
         fi
     fi
 
@@ -779,7 +777,6 @@ set_default_arch
 
 mirror="http://distfiles.gentoo.org"
 user="root"
-password="toor"
 tty=1
 settings="common"
 options=$(getopt -o hp:n:a:FcPv:t:S:u:w:s:m: -l help,rootfs:,path:,name:,arch:,flush-cache,cache-only,private-portage,variant:,portage-dir:,tarball:,auth-key:,user:,autologin,password:,settings:,mirror:,tty: -- "$@")
diff --git a/templates/lxc-openmandriva.in b/templates/lxc-openmandriva.in
index 12f998512..daba81202 100644
--- a/templates/lxc-openmandriva.in
+++ b/templates/lxc-openmandriva.in
@@ -46,7 +46,6 @@ hostarch=$(uname -m)
 cache_base="${LXC_CACHE_PATH:-@LOCALSTATEDIR@/cache/lxc/openmandriva/$arch}"
 default_path=@LXCPATH@
 default_profile=default
-root_password=root
 lxc_network_type=veth
 lxc_network_link=br0
 
diff --git a/templates/lxc-pld.in b/templates/lxc-pld.in
index f233ae6a6..a8e534646 100644
--- a/templates/lxc-pld.in
+++ b/templates/lxc-pld.in
@@ -38,7 +38,6 @@ done
 arch=$(uname -m)
 cache_base=@LOCALSTATEDIR@/cache/lxc/pld/$arch
 default_path=@LXCPATH@
-root_password=root
 
 if [ -e /etc/os-release ]; then
 	# This is a shell friendly configuration file.  We can just source it.
@@ -105,8 +104,10 @@ EOF
 	mknod -m 600 ${dev_path}/initctl p
 	mknod -m 666 ${dev_path}/ptmx c 5 2
 
-	echo "setting root passwd to $root_password"
-	echo "root:$root_password" | chroot $rootfs_path chpasswd
+	if [ -n "${root_password}" ]; then
+		echo "setting root passwd to $root_password"
+		echo "root:$root_password" | chroot $rootfs_path chpasswd
+	fi
 
 	return 0
 }