From 0cd74eff38abfd5ac3469183ade379c44b1f5f3c Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 28 Mar 2014 11:19:36 -0400 Subject: [PATCH 1/3] generate docker root password in a way that doesn't hang --- docker/docker-6.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-6.ks b/docker/docker-6.ks index d71e81d..d6eecb6 100644 --- a/docker/docker-6.ks +++ b/docker/docker-6.ks @@ -66,7 +66,7 @@ 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 # cleanup unwanted stuff From 762725c294fe46f125c636ef04fbbaa2439a0e48 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 28 Mar 2014 11:18:16 -0400 Subject: [PATCH 2/3] docker: add console device --- docker/docker-6.ks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/docker-6.ks b/docker/docker-6.ks index d6eecb6..e303090 100644 --- a/docker/docker-6.ks +++ b/docker/docker-6.ks @@ -69,6 +69,9 @@ reboot 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 From 3a624d843543526fdecbd8bc39c0a98118e9c7da Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 28 Mar 2014 11:18:29 -0400 Subject: [PATCH 3/3] docker: remove unwanted output from conversion script --- docker/img2docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/img2docker.sh b/docker/img2docker.sh index 9249915..0950155 100755 --- a/docker/img2docker.sh +++ b/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"