From 2eabec72fe52cd8b2389030de7a8c2b451d2b7df860772dfe214899e187e083c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 3 Jul 2014 16:14:53 +0000 Subject: [PATCH] - Include mkinitrd scripts for btrfs OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=291 --- libguestfs.changes | 5 +++++ libguestfs.mkinitrd.boot-btrfs.sh | 22 ++++++++++++++++++++++ libguestfs.mkinitrd.setup-btrfs.sh | 6 ++++++ libguestfs.spec | 6 +++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 libguestfs.mkinitrd.boot-btrfs.sh create mode 100644 libguestfs.mkinitrd.setup-btrfs.sh diff --git a/libguestfs.changes b/libguestfs.changes index 9f511dd..f29d9c0 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 3 18:13:19 CEST 2014 - ohering@suse.de + +- Include mkinitrd scripts for btrfs + ------------------------------------------------------------------- Wed Jul 2 11:27:26 CEST 2014 - ohering@suse.de diff --git a/libguestfs.mkinitrd.boot-btrfs.sh b/libguestfs.mkinitrd.boot-btrfs.sh new file mode 100644 index 0000000..9c59ee6 --- /dev/null +++ b/libguestfs.mkinitrd.boot-btrfs.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e +#%stage: filesystem +#%depends: dm dmraid lvm2 udev md luks +#%programs: btrfs +#%programs: btrfs-convert +#%programs: btrfs-debug-tree +#%programs: btrfs-dump-super +#%programs: btrfs-find-root +#%programs: btrfs-image +#%programs: btrfs-select-super +#%programs: btrfs-zero-log +#%programs: btrfsck +#%programs: btrfstune +# for fsck(8): listed twice so that a copy really ends up in /sbin +#%programs: /sbin/fsck.btrfs +#%programs: fsck.btrfs +#%programs: mkfs.btrfs +#%modules: btrfs + +modprobe btrfs + +btrfs dev scan >& /dev/null diff --git a/libguestfs.mkinitrd.setup-btrfs.sh b/libguestfs.mkinitrd.setup-btrfs.sh new file mode 100644 index 0000000..8cbe45c --- /dev/null +++ b/libguestfs.mkinitrd.setup-btrfs.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# +#%stage: filesystem + +mkdir -p $tmp_mnt/etc/udev/rules.d +cp /usr/lib/udev/rules.d/64-btrfs.rules $tmp_mnt/etc/udev/rules.d diff --git a/libguestfs.spec b/libguestfs.spec index c8786b2..f0c98ed 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -169,6 +169,8 @@ Source16: libguestfs.mkinitrd.boot-md.sh Source17: libguestfs.mkinitrd.setup-md.sh Source18: libguestfs.mkinitrd.boot-nfs.sh Source19: libguestfs.mkinitrd.setup-nfs.sh +Source20: libguestfs.mkinitrd.setup-btrfs.sh +Source21: libguestfs.mkinitrd.setup-btrfs.sh # Source1220: libguestfs.mkinitrd.1220.patch Source1210: libguestfs.mkinitrd.1210.patch @@ -650,6 +652,8 @@ cp -avL %{S:16} mkinitrd/scripts/boot-md.sh cp -avL %{S:17} mkinitrd/scripts/setup-md.sh 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 mkdir -vp mkinitrd/setup mkinitrd/boot ln -sfvbn lib/mkinitrd/bin mkinitrd/bin @@ -738,7 +742,7 @@ bash -x \ -i initramfs.${arch}.img \ -b $PWD/mkinitrd/boot_tmp \ -m "$additional_modules" \ - -f "lvm2 dm md network nfs" \ + -f "lvm2 dm md network nfs btrfs" \ -B # mkdir -vp $RPM_BUILD_ROOT%{_libdir}/guestfs