From 1c1cda890260da353bbb14cb720b51e62c7918c1 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 20 Sep 2008 20:49:38 +0000 Subject: [PATCH] overlay: enhanced .patch handling --- lib/overlay/overlay-functions.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/overlay/overlay-functions.in b/lib/overlay/overlay-functions.in index bda6214..7537635 100644 --- a/lib/overlay/overlay-functions.in +++ b/lib/overlay/overlay-functions.in @@ -41,6 +41,7 @@ overlay_apply() { local overlaydir="$1" rootfs="${2:-$root}" local file= source= target= ext= local type= mode= ref= targetdir= + local patchopt="-p1 --no-backup-if-mismatch -N" for file in "$overlaydir"/*; do # only consider known overlay types @@ -72,7 +73,8 @@ overlay_apply() { ln -snf "$ref" "$rootfs/$target" ;; patch) - echo_status "$(patch -p1 -d "${rootfs}" 2>&1 < $file )" + echo_status "$(patch $patchopt \ + -d "${rootfs}" 2>&1 < $file )" ;; esac done