Merge pull request #1358 from evgeni/no-default-passwords

do not set insecure passwords
This commit is contained in:
Christian Brauner 2016-12-16 00:16:34 +01:00 committed by GitHub
commit 7d091d9e96
6 changed files with 6 additions and 47 deletions

View File

@ -330,35 +330,6 @@ configure_busybox()
chmod +s $rootfs/bin/passwd chmod +s $rootfs/bin/passwd
touch $rootfs/etc/shadow touch $rootfs/etc/shadow
# setting passwd for root
CHPASSWD_FILE=$rootfs/root/chpasswd.sh
cat <<EOF >$CHPASSWD_FILE
echo "setting root password to \"root\""
mount -n --bind /lib $rootfs/lib
if [ \$? -ne 0 ]; then
echo "Failed bind-mounting /lib at $rootfs/lib"
exit 1
fi
chroot $rootfs chpasswd <<EOFF 2>/dev/null
root:root
EOFF
if [ \$? -ne 0 ]; then
echo "Failed to change root password"
exit 1
fi
umount $rootfs/lib
EOF
lxc-unshare -s MOUNT -- /bin/sh < $CHPASSWD_FILE
rm $CHPASSWD_FILE
return 0 return 0
} }

View File

@ -112,7 +112,6 @@ EOF
touch $rootfs/etc/sysconfig/kernel touch $rootfs/etc/sysconfig/kernel
echo "Please change root-password !" echo "Please change root-password !"
echo "root:root" | chpasswd -R $rootfs
return 0 return 0
} }

View File

@ -462,12 +462,10 @@ EOF
fi fi
fi fi
# add oracle user, set root password # add oracle user
chroot $container_rootfs useradd -m -s /bin/bash oracle chroot $container_rootfs useradd -m -s /bin/bash oracle
echo "oracle:oracle" | chroot $container_rootfs chpasswd printf "Added container user:\033[1moracle\033[0m\n"
echo "root:root" | chroot $container_rootfs chpasswd printf "Added container user:\033[1mroot\033[0m\n"
printf "Added container user:\033[1moracle\033[0m password:\033[1moracle\033[0m\n"
printf "Added container user:\033[1mroot\033[0m password:\033[1mroot\033[0m\n"
} }
# create the container's lxc config file # create the container's lxc config file

View File

@ -186,9 +186,6 @@ configure_plamo() {
# glibc configure # glibc configure
mv $rootfs/etc/ld.so.conf{.new,} mv $rootfs/etc/ld.so.conf{.new,}
chroot $rootfs ldconfig chroot $rootfs ldconfig
# root password
echo "Setting root password to 'root'..."
echo "root:root" | chroot $rootfs chpasswd
echo "Please change root password!" echo "Please change root password!"
ed - $rootfs/etc/rc.d/rc.S <<- "EOF" ed - $rootfs/etc/rc.d/rc.S <<- "EOF"
/^mount -w -n -t proc/;/^mkdir \/dev\/shm/-1d /^mount -w -n -t proc/;/^mkdir \/dev\/shm/-1d

View File

@ -471,10 +471,6 @@ sed -i 's/.*genpowerfail.*//' $rootfs/etc/inittab
# add a message to rc.local that confirms successful container startup # add a message to rc.local that confirms successful container startup
echo "echo ; echo \"* container $name started. *\" ; echo" >> $rootfs/etc/rc.d/rc.local echo "echo ; echo \"* container $name started. *\" ; echo" >> $rootfs/etc/rc.d/rc.local
# set a default combination for the luggage
echo "root:root" | chroot $rootfs chpasswd
echo "Root default password is 'root', please change it!"
# borrow the time configuration from the local machine # borrow the time configuration from the local machine
cp -a /etc/localtime $rootfs/etc/localtime cp -a /etc/localtime $rootfs/etc/localtime

View File

@ -296,12 +296,10 @@ EOF
echo "Timezone in container is not configured. Adjust it manually." echo "Timezone in container is not configured. Adjust it manually."
fi fi
# add oracle user, set root password # add oracle user
chroot $container_rootfs useradd -m -s /bin/bash oracle chroot $container_rootfs useradd -m -s /bin/bash oracle
echo "oracle:oracle" | chroot $container_rootfs chpasswd printf "Added container user:\033[1moracle\033[0m\n"
echo "root:root" | chroot $container_rootfs chpasswd printf "Added container user:\033[1mroot\033[0m\n"
printf "Added container user:\033[1moracle\033[0m password:\033[1moracle\033[0m\n"
printf "Added container user:\033[1mroot\033[0m password:\033[1mroot\033[0m\n"
} }
# create the container's lxc config file # create the container's lxc config file