From 7ff4f2fa187054584e9c2b0d60791f22b743d8ff3de66f286a52845c1e4c9b97 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 8 Jul 2014 10:53:33 +0000 Subject: [PATCH] - Handle empty /lib/mkinitrd/scripts gracefully OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=299 --- libguestfs.changes | 5 +++++ libguestfs.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 71cf274..28e09f5 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 8 12:52:58 CEST 2014 - ohering@suse.de + +- Handle empty /lib/mkinitrd/scripts gracefully + ------------------------------------------------------------------- Mon Jul 7 10:12:36 CEST 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 9ab38f0..2d3e507 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -677,7 +677,14 @@ cp -avL %{S:18} mkinitrd/scripts/boot-nfs.sh cp -avL %{S:19} mkinitrd/scripts/setup-nfs.sh cp -avL %{S:20} mkinitrd/scripts/setup-btrfs.sh cp -avL %{S:21} mkinitrd/scripts/setup-btrfs.sh -cp -avb /lib/mkinitrd/scripts/* mkinitrd/scripts +for i in /lib/mkinitrd/scripts/* +do + if test -f "$i" + then + cp -avbt mkinitrd/scripts "$i" + break + fi +done mkdir -vp mkinitrd/setup mkinitrd/boot ln -sfvbn lib/mkinitrd/bin mkinitrd/bin sed -i~ "s@^INITRD_PATH=/lib/mkinitrd@INITRD_PATH=$PWD/mkinitrd@" mkinitrd/sbin/mkinitrd