summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-31 09:56:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-31 09:56:41 +0000
commit8acccfca085785a177ef42948d4021e2970dadab (patch)
treef97f1e8df17e107520395e00fd1cb6de426fac65
parent93a9ad6059ad4551bba2a95d296ca85c585b19e1 (diff)
downloaddrakx-8acccfca085785a177ef42948d4021e2970dadab.tar
drakx-8acccfca085785a177ef42948d4021e2970dadab.tar.gz
drakx-8acccfca085785a177ef42948d4021e2970dadab.tar.bz2
drakx-8acccfca085785a177ef42948d4021e2970dadab.tar.xz
drakx-8acccfca085785a177ef42948d4021e2970dadab.zip
patch with --no-backup-if-mismatch
-rwxr-xr-xmake_boot_img2
1 files changed, 1 insertions, 1 deletions
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";