Merge pull request #2 from stpierre/docker-ks-fixes

Docker kickstart fixes from stpierre

docker/docker-6.ks

@@ -66,9 +66,12 @@ reboot
 
 %post
 # randomize root password and lock root account
-tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1 | passwd --stdin root
+dd if=/dev/urandom count=50 | md5sum | passwd --stdin root
 passwd -l root
 
+# create necessary devices
+/sbin/MAKEDEV /dev/console
+
 # cleanup unwanted stuff
 
 # ami-creator requires grub during the install, so we remove it (and

docker/img2docker.sh

@@ -21,6 +21,6 @@ mount -o loop "$image" "$mount"
 
 cd "$mount"
 tar -cpSf - --acls --selinux --xattrs * | docker import - "$tag"
-cd -
+cd - >& /dev/null
 umount "$mount"
 rmdir "$mount"