diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sys-boot/elilo/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'sys-boot/elilo/files')
-rw-r--r-- | sys-boot/elilo/files/elilo-3.16-elilo-loop.patch | 15 | ||||
-rw-r--r-- | sys-boot/elilo/files/elilo.conf.sample | 9 | ||||
-rw-r--r-- | sys-boot/elilo/files/elilo.sh-chkspace.patch | 15 | ||||
-rw-r--r-- | sys-boot/elilo/files/elilo.sh-vmm.patch | 43 |
4 files changed, 82 insertions, 0 deletions
diff --git a/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch new file mode 100644 index 000000000000..b574c29f220b --- /dev/null +++ b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/299665 + +patch by Dennis Schridde <devurandom@gmx.net> + +--- a/debian/elilo.sh ++++ b/debian/elilo.sh +@@ -321,6 +321,8 @@ + + mnt() + { ++ local loop ++ + ## we can even create bootstrap filesystem images directly if you + ## ever wanted too. + if [ -f "$boot" ] ; then diff --git a/sys-boot/elilo/files/elilo.conf.sample b/sys-boot/elilo/files/elilo.conf.sample new file mode 100644 index 000000000000..ed97975c69d7 --- /dev/null +++ b/sys-boot/elilo/files/elilo.conf.sample @@ -0,0 +1,9 @@ +boot=/dev/sda1 +install=/usr/lib/elilo/elilo.efi +delay=20 +default=gentoo + +image=/boot/kernel-2.6.12-gentoo-r6 + label=gentoo + root=/dev/sda3 + read-only diff --git a/sys-boot/elilo/files/elilo.sh-chkspace.patch b/sys-boot/elilo/files/elilo.sh-chkspace.patch new file mode 100644 index 000000000000..710780e8da6c --- /dev/null +++ b/sys-boot/elilo/files/elilo.sh-chkspace.patch @@ -0,0 +1,15 @@ +Don't count duplicate files twice when summing bytesneeded + +--- elilo/debian/elilo.sh.chkspace 2006-03-16 07:53:00.000000000 -0500 ++++ elilo/debian/elilo.sh 2006-03-16 07:53:27.000000000 -0500 +@@ -580,7 +580,9 @@ + sed 's/.*=[[:space:]]*//' | grep -v ':'` + vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \ + sed 's/.*=[[:space:]]*//' | grep -v ':'` +- bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c` ++ allfiles=`for f in $imagefiles $initrdfiles $install $bootconf; do \ ++ echo $f; done | sort -u` ++ bytesneeded=`cat $allfiles 2>/dev/null | wc -c` + # convert to KB, allowing 5% overhead + kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 )) + kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p") diff --git a/sys-boot/elilo/files/elilo.sh-vmm.patch b/sys-boot/elilo/files/elilo.sh-vmm.patch new file mode 100644 index 000000000000..294eb03b2226 --- /dev/null +++ b/sys-boot/elilo/files/elilo.sh-vmm.patch @@ -0,0 +1,43 @@ +Patch from Alex Williamson in +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185 support of vmm= in the +elilo script + +--- elilo/debian/elilo.sh.novmm 2006-03-16 07:49:19.000000000 -0500 ++++ elilo/debian/elilo.sh 2006-03-16 07:48:47.000000000 -0500 +@@ -364,6 +364,8 @@ + sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'` + initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \ + sed 's/.*=[[:space:]]*//' | grep -v ':'` ++ vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \ ++ sed 's/.*=[[:space:]]*//' | grep -v ':'` + + ## Point of no return, removing the old EFI/debian tree + rm -rf $TARGET/$EFIROOT +@@ -398,6 +400,7 @@ + -e "s|\t| |g" \ + -e "s|\(^image[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \ + -e "s|\(^[[:space:]]*initrd[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \ ++ -e "s|\(^[[:space:]]*vmm[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \ + < "$bootconf" > "$TARGET/$EFIROOT/$CFFILE" + if [ $? != 0 ] ; then + echo 1>&2 "$PRG: An error occured while writing to $boot" +@@ -406,7 +409,7 @@ + + [ "$DEBUG" = 1 ] && echo "----" && cat "$TARGET/$EFIROOT/$CFFILE" && echo "----" + +- for i in $imagefiles $initrdfiles; do ++ for i in $imagefiles $initrdfiles $vmmfiles; do + [ "$VERBOSE" = 1 ] && echo "$PRG: Installing $i on $boot..." + if [ -f $i ]; then + mkdir -p `dirname "$TARGET/$EFIROOT/$i"` +@@ -575,7 +578,9 @@ + sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'` + initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \ + sed 's/.*=[[:space:]]*//' | grep -v ':'` +- bytesneeded=`cat $imagefiles $initrdfiles $install $bootconf 2>/dev/null | wc -c` ++ vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \ ++ sed 's/.*=[[:space:]]*//' | grep -v ':'` ++ bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c` + # convert to KB, allowing 5% overhead + kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 )) + kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p") |