summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve McIntyre <steve@einval.com>2016-01-29 16:42:46 (GMT)
committerSteve McIntyre <steve@einval.com>2016-01-29 16:42:46 (GMT)
commite2fb84cd7d8436185c3818887a3f7d46b6ece534 (patch)
tree524508b2344b04c1a1e9934b17557762725057da
parent5a7bbfbaf79c4c07ecbbc9e8c4a79b6939114326 (diff)
downloaddebootstrap-e2fb84cd7d8436185c3818887a3f7d46b6ece534.zip
debootstrap-e2fb84cd7d8436185c3818887a3f7d46b6ece534.tar.gz
debootstrap-e2fb84cd7d8436185c3818887a3f7d46b6ece534.tar.bz2
Don't call mknod with --mode, it's not supported in busybox
Use -m instead - fixes the broken fix for #812811. Closes: #813124. Uploading with urgency high to get this fix propagated quickly - it's breaking d-i installs right now.
-rw-r--r--debian/changelog8
-rw-r--r--functions12
2 files changed, 12 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index eab4d75..2409ea9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-debootstrap (1.0.78) UNRELEASED; urgency=medium
+debootstrap (1.0.78) unstable; urgency=high
* Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
+ * Don't call mknod with the --mode option, it's not supported in
+ busybox. Use -m instead - fixes the broken fix for #812811.
+ Closes: #813124. Urgency high to get this fix propagated quickly -
+ it's breaking d-i installs right now.
- -- Colin Watson <cjwatson@debian.org> Fri, 29 Jan 2016 13:35:16 +0000
+ -- Steve McIntyre <93sam@debian.org> Fri, 29 Jan 2016 16:36:00 +0000
debootstrap (1.0.77) unstable; urgency=medium
diff --git a/functions b/functions
index 5c5a015..be4919f 100644
--- a/functions
+++ b/functions
@@ -1074,12 +1074,12 @@ setup_devices () {
setup_devices_simple () {
# The list of devices that can be created in a container comes from
# src/core/cgroup.c in the systemd source tree.
- mknod --mode=666 $TARGET/dev/null c 1 3
- mknod --mode=666 $TARGET/dev/zero c 1 5
- mknod --mode=666 $TARGET/dev/full c 1 7
- mknod --mode=666 $TARGET/dev/random c 1 8
- mknod --mode=666 $TARGET/dev/urandom c 1 9
- mknod --mode=666 $TARGET/dev/tty c 5 0
+ mknod -m 666 $TARGET/dev/null c 1 3
+ mknod -m 666 $TARGET/dev/zero c 1 5
+ mknod -m 666 $TARGET/dev/full c 1 7
+ mknod -m 666 $TARGET/dev/random c 1 8
+ mknod -m 666 $TARGET/dev/urandom c 1 9
+ mknod -m 666 $TARGET/dev/tty c 5 0
mkdir $TARGET/dev/pts/ $TARGET/dev/shm/
ln -s pts/ptmx $TARGET/dev/ptmx
ln -s /proc/self/fd $TARGET/dev/fd