From 8acccfca085785a177ef42948d4021e2970dadab Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 31 Aug 2001 09:56:41 +0000 Subject: patch with --no-backup-if-mismatch --- make_boot_img | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'make_boot_img') diff --git a/make_boot_img b/make_boot_img index b7a48b99b..e562bb40a 100755 --- a/make_boot_img +++ b/make_boot_img @@ -91,7 +91,7 @@ sub initrd { my $ftype = $type =~ /^(all)$/ ? "pcmcia" : $type; if ($ftype eq "pcmcia" && $arch !~ /ppc/ && $arch !~ /ia64/) { _ "$sudo cp -a /etc/pcmcia $mnt/etc"; - _ "$sudo patch -p0 -d $mnt/etc < $instdir/pcmcia_config.patch"; + _ "$sudo patch --no-backup-if-mismatch -p0 -d $mnt/etc < $instdir/pcmcia_config.patch"; } my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; $modz = "all.modules$I/$ext"; -- cgit v1.2.1