summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Hess <joeyh@debian.org>2010-09-26 17:16:37 (GMT)
committerJoey Hess <joeyh@debian.org>2010-09-26 17:16:37 (GMT)
commit26ae73c1291ff8d282f7ca7f6e1d4df2e5549759 (patch)
treed2115da72137c77be41b740571fd51cdf3850384
parent655f833be4a8d2bd110bd3c0caa2fc17af119988 (diff)
downloaddebootstrap-26ae73c1291ff8d282f7ca7f6e1d4df2e5549759.zip
debootstrap-26ae73c1291ff8d282f7ca7f6e1d4df2e5549759.tar.gz
debootstrap-26ae73c1291ff8d282f7ca7f6e1d4df2e5549759.tar.bz2
/dev/MAKEDEV cannot be relied on (udev likes to make it a symlink to
true). Always use /sbin/MAKEDEV. Closes: #598080 r64850
-rw-r--r--Makefile2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b2afaaa..b483020 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# avoid dpkg-dev dependency; fish out the version with sed
VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog)
-MAKEDEV := $(shell if [ -e /dev/MAKEDEV ]; then echo /dev/MAKEDEV; else echo /sbin/MAKEDEV; fi)
+MAKEDEV := /sbin/MAKEDEV
all: devices.tar.gz
clean:
diff --git a/debian/changelog b/debian/changelog
index 922febb..382e94e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
debootstrap (1.0.25) UNRELEASED; urgency=low
* Remove debug statement that slipped in.
- * Add test that devices.tar.gz not be somehow empty. Closes: #598080
+ * Add test to guard against devices.tar.gz being empty.
+ * /dev/MAKEDEV cannot be relied on (udev likes to make it a symlink to
+ true). Always use /sbin/MAKEDEV. Closes: #598080
-- Joey Hess <joeyh@debian.org> Mon, 20 Sep 2010 13:22:56 -0400