summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Pasch <fpasch@googlemail.com>2010-08-29 21:32:33 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-08-29 21:34:03 (GMT)
commitc4cdcc3680c5dc551fa563b2133ca83c55967495 (patch)
treecde36a47b1b158bb06b1fdf233e77673ea4a946f
parentde846f6e043bf6fe13fb387cd92585a7a70913a7 (diff)
downloadbuildroot-c4cdcc3680c5dc551fa563b2133ca83c55967495.tar.gz
buildroot-c4cdcc3680c5dc551fa563b2133ca83c55967495.tar.bz2
initramfs: Don't overwrite $(TARGET_DIR)/init if it exists
Closes #2443 Allow use of custom init scripts. Signed-off-by: Simon Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES1
-rw-r--r--fs/initramfs/initramfs.mk5
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 8550b6f..7ab4aa4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@
#635: util-linux fails to build in 2009.08
#2239: netcat package installs its binary to target as avr32-linux...
+ #2443: Initramfs: Don't overwrite $(TARGET_DIR)/init if it exists
#2449: Minor fixes for squashfs makefile and correct PowerPC e500 ...
2010.08-rc1, Released July 30th, 2010:
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index e6d004e..30969a4 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -13,8 +13,9 @@ INITRAMFS_TARGET:= #nothing
endif
define ROOTFS_INITRAMFS_INIT_SYMLINK
- rm -f $(TARGET_DIR)/init
- ln -s sbin/init $(TARGET_DIR)/init
+ if [ ! -e $(TARGET_DIR)/init ]; then \
+ ln -s sbin/init $(TARGET_DIR)/init; \
+ fi
endef
ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_INIT_SYMLINK