Commit 436ab4be by Evgeni Golov

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

Refs: #1158 Signed-off-by: 's avatarEvgeni Golov <evgeni@debian.org>
parent b49bb7dc
...@@ -43,7 +43,6 @@ cache_base=@LOCALSTATEDIR@/cache/lxc/altlinux/$arch ...@@ -43,7 +43,6 @@ cache_base=@LOCALSTATEDIR@/cache/lxc/altlinux/$arch
default_path=@LXCPATH@ default_path=@LXCPATH@
default_profile=default default_profile=default
profile_dir=/etc/lxc/profiles profile_dir=/etc/lxc/profiles
root_password=rooter
lxc_network_type=veth lxc_network_type=veth
lxc_network_link=virbr0 lxc_network_link=virbr0
...@@ -156,8 +155,10 @@ EOF ...@@ -156,8 +155,10 @@ EOF
mkdir -m 755 ${dev_path}/net mkdir -m 755 ${dev_path}/net
mknod -m 666 ${dev_path}/net/tun c 10 200 mknod -m 666 ${dev_path}/net/tun c 10 200
echo "setting root passwd to $root_password" if [ -n "${root_password}" ]; then
echo "root:$root_password" | chroot $rootfs_path chpasswd echo "setting root passwd to $root_password"
echo "root:$root_password" | chroot $rootfs_path chpasswd
fi
return 0 return 0
} }
......
...@@ -654,8 +654,6 @@ container_auth() ...@@ -654,8 +654,6 @@ container_auth()
printf " => done. if you didn't specify , default is 'toor'\n" printf " => done. if you didn't specify , default is 'toor'\n"
if [[ -n "${forced_password}" ]]; then if [[ -n "${forced_password}" ]]; then
store_user_message "${user} has the password you give for him" 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
fi fi
...@@ -779,7 +777,6 @@ set_default_arch ...@@ -779,7 +777,6 @@ set_default_arch
mirror="http://distfiles.gentoo.org" mirror="http://distfiles.gentoo.org"
user="root" user="root"
password="toor"
tty=1 tty=1
settings="common" 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: -- "$@") 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: -- "$@")
......
...@@ -46,7 +46,6 @@ hostarch=$(uname -m) ...@@ -46,7 +46,6 @@ hostarch=$(uname -m)
cache_base="${LXC_CACHE_PATH:-@LOCALSTATEDIR@/cache/lxc/openmandriva/$arch}" cache_base="${LXC_CACHE_PATH:-@LOCALSTATEDIR@/cache/lxc/openmandriva/$arch}"
default_path=@LXCPATH@ default_path=@LXCPATH@
default_profile=default default_profile=default
root_password=root
lxc_network_type=veth lxc_network_type=veth
lxc_network_link=br0 lxc_network_link=br0
......
...@@ -38,7 +38,6 @@ done ...@@ -38,7 +38,6 @@ done
arch=$(uname -m) arch=$(uname -m)
cache_base=@LOCALSTATEDIR@/cache/lxc/pld/$arch cache_base=@LOCALSTATEDIR@/cache/lxc/pld/$arch
default_path=@LXCPATH@ default_path=@LXCPATH@
root_password=root
if [ -e /etc/os-release ]; then if [ -e /etc/os-release ]; then
# This is a shell friendly configuration file. We can just source it. # This is a shell friendly configuration file. We can just source it.
...@@ -105,8 +104,10 @@ EOF ...@@ -105,8 +104,10 @@ EOF
mknod -m 600 ${dev_path}/initctl p mknod -m 600 ${dev_path}/initctl p
mknod -m 666 ${dev_path}/ptmx c 5 2 mknod -m 666 ${dev_path}/ptmx c 5 2
echo "setting root passwd to $root_password" if [ -n "${root_password}" ]; then
echo "root:$root_password" | chroot $rootfs_path chpasswd echo "setting root passwd to $root_password"
echo "root:$root_password" | chroot $rootfs_path chpasswd
fi
return 0 return 0
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment