[PATCH 3/5] Revert "UBUNTU: [Debian] dtb: don't follow symlink when checking for a directory"
Paolo Pisati
paolo.pisati at canonical.com
Mon Sep 1 11:29:07 UTC 2014
This reverts commit a282edfe0127af66898f5e2af269db941e3a0f44.
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
debian/control-scripts/postinst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control-scripts/postinst b/debian/control-scripts/postinst
index 7e99410..a388cef 100644
--- a/debian/control-scripts/postinst
+++ b/debian/control-scripts/postinst
@@ -767,7 +767,7 @@ sub image_magic {
# Well, in any case, if the destination (the symlink we are trying
# to create) is a directory, we should do nothing, except throw a
# diagnostic.
- if (-d "$kimage" && ! -l "$kimage") {
+ if (-d "$kimage" ) {
die ("Hmm. $kimage is a directory, which I did not expect. I am\n" .
"trying to create a symbolic link with that name linked to \n" .
"$image_dest . Since a directory exists here, my assumptions \n" .
--
1.9.1
More information about the kernel-team
mailing list