summaryrefslogtreecommitdiff
path: root/debvm-create
diff options
context:
space:
mode:
Diffstat (limited to 'debvm-create')
-rwxr-xr-xdebvm-create15
1 files changed, 10 insertions, 5 deletions
diff --git a/debvm-create b/debvm-create
index 1f5e8df..5ddbd2f 100755
--- a/debvm-create
+++ b/debvm-create
@@ -75,10 +75,6 @@ The following tasks may be skipped.
=over 4
-=item B<systemdnetwork>
-
-skips installing B<libnss-resolve> as well as automatic network configuration via B<systemd-networkd>.
-
=item B<packagelists>
reduces the package lists inside the image.
@@ -86,6 +82,15 @@ The B<available> database for B<dpkg> is not created.
The package lists used by B<apt> are deleted.
This generally produces a smaller image, but you need to run B<apt update> before installing packages and B<dpkg --set-selections> does not work.
+=item B<systemdnetwork>
+
+skips installing B<libnss-resolve> as well as automatic network configuration via B<systemd-networkd>.
+
+=item B<usrmerge>
+
+By default B<debvm> adds a hook to enable merged-/usr without the B<usrmerge> package given a sufficiently recent Debian release.
+Without the hook, dependencies will pull the B<usrmerge> package as needed, which may result in a larger installation.
+
=back
=item B<-z> I<size_in_GB>, B<--size>=I<size_in_GB>
@@ -355,7 +360,7 @@ if test "$DEBVER" -le 8; then
set -- --hook-dir=/usr/share/mmdebstrap/hooks/jessie-or-older "$@"
fi
-if test "$DEBVER" -ge 12; then
+if test "$DEBVER" -ge 12 && ! check_skip usrmerge; then
# Avoid the usrmerge package
set -- --hook-dir=/usr/share/mmdebstrap/hooks/merged-usr "$@"
fi