From 013dff431ef1ce207f8971b5ba8c9d28d0e4a59b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 17 Jul 2018 12:02:34 +1200 Subject: [PATCH 1/4] Remove device nodes from Docker images. (LP: #1645468) --- debian/changelog | 3 +++ live-build/auto/build | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3975252a..151fee95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium * Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) + [ Michael Hudson-Doyle ] + * Remove device nodes from Docker images. (LP: #1645468) + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium diff --git a/live-build/auto/build b/live-build/auto/build index 519ce1e7..c217bbe1 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -266,6 +266,9 @@ EOF # Save even more size by removing apt lists (that are currently removed # downstream anyway) rm -rf chroot/var/lib/apt/lists/* + # Having device notes in the docker image can cause problems: + # https://github.com/tianon/docker-brew-ubuntu-core/issues/62 + rm -rf chroot/dev/* fi if [ -f config/oem-config-preinstalled ]; then From 092b316357b53bdce9e2d1c2723e1df43892bd74 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 17 Jul 2018 13:34:01 +1200 Subject: [PATCH 2/4] add a comment explaining why /dev cleaning is docker-only --- live-build/auto/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index c217bbe1..fdb216c3 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -266,8 +266,11 @@ EOF # Save even more size by removing apt lists (that are currently removed # downstream anyway) rm -rf chroot/var/lib/apt/lists/* - # Having device notes in the docker image can cause problems: - # https://github.com/tianon/docker-brew-ubuntu-core/issues/62 + # Having device notes in the docker image can cause problems + # (https://github.com/tianon/docker-brew-ubuntu-core/issues/62) + # so remove them. We only do this for docker because the rootfs + # for system booting without initramfs needs a minimal /dev to + # get to the point of running udev. rm -rf chroot/dev/* fi From 333a3e2b1b71a77fcdf6bcc624c78d40f72fd238 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 18 Jul 2018 10:11:25 +1200 Subject: [PATCH 3/4] moderate comment --- live-build/auto/build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index fdb216c3..de06b566 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -268,9 +268,8 @@ EOF rm -rf chroot/var/lib/apt/lists/* # Having device notes in the docker image can cause problems # (https://github.com/tianon/docker-brew-ubuntu-core/issues/62) - # so remove them. We only do this for docker because the rootfs - # for system booting without initramfs needs a minimal /dev to - # get to the point of running udev. + # so remove them. We only do this for docker out of an + # abundance of caution. rm -rf chroot/dev/* fi From c241a3e3f848614a8494710605db351500b2ef73 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 26 Sep 2018 12:43:50 +1200 Subject: [PATCH 4/4] fix changelog --- debian/changelog | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26638736..33233a26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.541) UNRELEASED; urgency=medium + + * Remove device nodes from Docker images. (LP: #1645468) + + -- Michael Hudson-Doyle Wed, 26 Sep 2018 12:43:23 +1200 + livecd-rootfs (2.540) cosmic; urgency=medium * Ensure /lib/modules exists in root tarballs and sqashfs. @@ -64,9 +70,6 @@ livecd-rootfs (2.533) cosmic; urgency=medium * Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) - [ Michael Hudson-Doyle ] - * Remove device nodes from Docker images. (LP: #1645468) - -- Adam Conrad Wed, 18 Jul 2018 11:06:54 -0600 livecd-rootfs (2.532) cosmic; urgency=medium