Hi Adam,
On Sun, Jun 23, 2024 at 11:02:50AM +0100, Adam D. Barratt wrote:
> This is a little non-ideal from the review perspective, because it
> means we can't actually see what the changelog looks like to confirm
> that e.g. the version and distribution are correct.
Indeed. I shall adhere to the process next time. Uploaded and actual
.debdiff attached.
> I'm going to assume that you'll get them correct, so please go ahead.
> Note that the window for getting uploads into 12.7 will close at some
> point today.
I didn't have the schedule in mind and am merely lucky (or unlucky)
here. Other uploads are probably more important than this one.
Helmut
diff --minimal -Nru debvm-0.2.10/bin/debvm-create
debvm-0.2.10+deb12u1/bin/debvm-create
--- debvm-0.2.10/bin/debvm-create 2023-03-21 07:42:07.000000000 +0100
+++ debvm-0.2.10+deb12u1/bin/debvm-create 2024-06-23 13:27:07.000000000
+0200
@@ -386,7 +386,9 @@
fi
if ! check_skip autologin; then
- set -- "--customize-hook=$SHARE_DIR/customize-autologin.sh" "$@"
+ set -- \
+ --include=login \
+ "--customize-hook=$SHARE_DIR/customize-autologin.sh" "$@"
fi
set -- "$SUITE" "$IMAGE" "$@"
diff --minimal -Nru debvm-0.2.10/bin/debvm-run
debvm-0.2.10+deb12u1/bin/debvm-run
--- debvm-0.2.10/bin/debvm-run 2023-03-21 07:42:07.000000000 +0100
+++ debvm-0.2.10+deb12u1/bin/debvm-run 2024-06-23 13:27:07.000000000 +0200
@@ -356,7 +356,7 @@
KERNEL_CMDLINE="$KERNEL_CMDLINE console=ttyS0"
;;
esac
- if test -t 0 && test -t 1 && test -n "$TERM"; then
+ if test -t 0 && test -t 1 && test -n "${TERM:-}"; then
KERNEL_CMDLINE="$KERNEL_CMDLINE TERM=$TERM"
fi
else
diff --minimal -Nru debvm-0.2.10/bin/debvm-waitssh
debvm-0.2.10+deb12u1/bin/debvm-waitssh
--- debvm-0.2.10/bin/debvm-waitssh 2023-03-21 07:42:07.000000000 +0100
+++ debvm-0.2.10+deb12u1/bin/debvm-waitssh 2024-06-23 13:27:07.000000000
+0200
@@ -107,7 +107,7 @@
"opt_$OPTARG" "$(nth_arg "$OPTIND"
"$@")"
OPTIND=$((OPTIND+1))
;;
- timeout=)
+ timeout=*)
"opt_${OPTARG%%=*}" "${OPTARG#*=}"
;;
*)
diff --minimal -Nru debvm-0.2.10/debian/changelog
debvm-0.2.10+deb12u1/debian/changelog
--- debvm-0.2.10/debian/changelog 2023-03-21 07:42:07.000000000 +0100
+++ debvm-0.2.10+deb12u1/debian/changelog 2024-06-23 13:27:07.000000000
+0200
@@ -1,3 +1,19 @@
+debvm (0.2.10+deb12u1) bookworm; urgency=medium
+
+ [ Johannes Schauer Marin Rodrigues ]
+ * bin/debvm-run: allow being run in environments without TERM set
+
+ [ Jochen Sprickerhof ]
+ * Fix resolv.conf in stretch
+
+ [ Johannes Schauer Marin Rodrigues ]
+ * bin/debvm-waitssh: make --timeout=N work
+
+ [ Helmut Grohne ]
+ * debvm-create: do install login
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 23 Jun 2024 13:27:07 +0200
+
debvm (0.2.10) unstable; urgency=medium
* The "polish for bookworm" release.
diff --minimal -Nru debvm-0.2.10/share/customize-resolved.sh
debvm-0.2.10+deb12u1/share/customize-resolved.sh
--- debvm-0.2.10/share/customize-resolved.sh 2023-03-21 07:42:07.000000000
+0100
+++ debvm-0.2.10+deb12u1/share/customize-resolved.sh 2024-06-23
13:27:07.000000000 +0200
@@ -18,7 +18,7 @@
chroot "$TARGET" systemctl enable systemd-resolved.service
fi
- if test -z "$LIBNSS_RESOLVE_VERSION"; then
+ if test -z "$LIBNSS_RESOLVE_VERSION" || dpkg --compare-versions
"$LIBNSS_RESOLVE_VERSION" lt 236; then
ln -fs ../run/systemd/resolve/resolv.conf
"$TARGET/etc/resolv.conf"
else
ln -fs ../run/systemd/resolve/stub-resolv.conf
"$TARGET/etc/resolv.conf"
