sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Allow debootstrap to cleanup without a kernel"

Browse Source
This commit is contained in:
Zuul 2018-10-19 03:23:09 +00:00 committed by Gerrit Code Review
commit 07d263de0b
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/debootstrap/element-deps
View File

@ -1,2 +1,4 @@
dpkg dpkg
modprobe
pkg-map pkg-map

1
diskimage_builder/elements/debootstrap/install.d/15-cleanup-debootstrap
View File

@ -22,4 +22,3 @@ set -eu
set -o pipefail set -o pipefail
install -d -m 0755 -o root -g root /etc/sudoers.d install -d -m 0755 -o root -g root /etc/sudoers.d
echo 'blacklist pcspkr' > /etc/modprobe.d/blacklist.conf

11
diskimage_builder/elements/modprobe/extra-data.d/50-modprobe-blacklist
View File

@ -6,6 +6,17 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
# This would only not be here if there was no kmod package installed,
# which can happen in some container situations. Obviously
# blacklisting a kernel module is not really useful; however allowing
# this to work can allow modules that do other things that *are*
# useful for a container to "just work" without a whole bunch of
# refactoring.
if [ ! -d /etc/modprobe.d ]; then
# ^ so we can see in the logs if we took this path ...
mkdir -p /etc/modprobe.d
fi
# copy all modprobe.d snippets to /etc/modprobe.d # copy all modprobe.d snippets to /etc/modprobe.d
eval declare -A image_elements=($(get_image_element_array)) eval declare -A image_elements=($(get_image_element_array))