rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

- Update libguestfs.mkinitrd.1210.patch to create /usr/*bin in 11.4

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=230
This commit is contained in:
Olaf Hering 2013-08-22 09:37:10 +00:00 committed by Git OBS Bridge
parent cf8b279489
commit cf3506976f
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libguestfs.changes
View File

@ -1,10 +1,11 @@
-------------------------------------------------------------------
Thu Aug 22 10:10:00 CEST 2013 - ohering@suse.de
Thu Aug 22 11:36:24 CEST 2013 - ohering@suse.de
- Add network related modules to initrd (bnc#835949)
- Remove supermin.d
- Mount also /dev/pts in mount-rootfs-and-do-chroot.sh
- Handle rw option in ext4.ko
- Update libguestfs.mkinitrd.1210.patch to create /usr/*bin in 11.4
-------------------------------------------------------------------
Mon Aug 19 23:23:31 CEST 2013 - ohering@suse.de

46
libguestfs.mkinitrd.1210.patch
View File

@ -1,7 +1,7 @@
---
mkinitrd/scripts/setup-prepare.sh | 90 +++++++++++++++++++++++++++++++-------
mkinitrd/scripts/setup-progs.sh | 17 +------
2 files changed, 78 insertions(+), 29 deletions(-)
mkinitrd/scripts/setup-prepare.sh | 94 +++++++++++++++++++++++++++++++-------
mkinitrd/scripts/setup-progs.sh | 17 +-----
2 files changed, 80 insertions(+), 31 deletions(-)
Index: 1210/mkinitrd/scripts/setup-prepare.sh
===================================================================
@ -29,11 +29,7 @@ Index: 1210/mkinitrd/scripts/setup-prepare.sh
cp_bin() {
- cp -a "$@" \
- || exit_code=1
+ local -a files
+ local target
+ local target_dirname
+ local file
-
- # Remember the binaries installed. We need the list for checking
- # for dynamic libraries.
- while [ $# -gt 1 ]; do
@ -47,6 +43,11 @@ Index: 1210/mkinitrd/scripts/setup-prepare.sh
- elif [ -d "$1" -o -f "$1" ]; then
- find "$1" -type f -print0 | xargs -0 chmod 0755
- fi
+ local -a files
+ local target
+ local target_dirname
+ local file
+
+ # need at least two parameters, source and destination
+ if test $# -lt 2
+ then
@ -126,6 +127,35 @@ Index: 1210/mkinitrd/scripts/setup-prepare.sh
feature="${1##*/}"
feature="${feature#*-}"
feature="${feature%.sh}"
@@ -143,27 +203,27 @@ fi
for feature in $ADDITIONAL_FEATURES ; do
feature_exists "$feature" || echo "[WARNING] Feature \"$feature\" not found. A typo?"
done
# create an empty initrd
if ! mkdir $tmp_mnt ; then
error 1 "could not create temporary directory"
fi
# fill the initrd
cp $INITRD_PATH/bin/linuxrc $linuxrc
mkdir "$tmp_mnt/boot"
-mkdir -p $tmp_mnt/{sbin,bin,etc,dev,proc,sys,root,config}
+mkdir -p $tmp_mnt/{sbin,bin,etc,dev,proc,sys,root,config,usr/bin,usr/sbin}
mkdir -p -m 4777 $tmp_mnt/tmp
# Create a dummy /etc/mtab for mount/umount
echo -n > $tmp_mnt/etc/mtab
# Add modprobe, modprobe.conf*, and a version of /bin/true: modprobe.conf
# might use it.
for mod in $root_dir/etc/modprobe.conf $root_dir/etc/modprobe.conf.local \
$root_dir/etc/modprobe.d ; do
test -e $mod && cp -r $mod $tmp_mnt/etc
done
cat > $tmp_mnt/bin/true <<-EOF
Index: 1210/mkinitrd/scripts/setup-progs.sh
===================================================================
--- 1210.orig/mkinitrd/scripts/setup-progs.sh