diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-06-02 15:29:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-02 15:29:04 +0100 |
commit | 27c1d146e5ee9e472a31a7958ad4dc70a5451ea7 (patch) | |
tree | fe573cd3516126d757c143a469871b88e5851548 /sys-fs/lvm2/files | |
parent | bc3875d3a71ac3fdb07c0fcf863843b4fdfcf0c0 (diff) |
gentoo auto-resync : 02:06:2023 - 15:29:04
Diffstat (limited to 'sys-fs/lvm2/files')
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch | 11 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch | 79 |
2 files changed, 0 insertions, 90 deletions
diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch deleted file mode 100644 index c672a10e2cf6..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -571,7 +571,7 @@ - ( cat $(srcdir)/.exported_symbols; \ - if test -n "$(EXPORTED_HEADER)"; then \ - $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ -- $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ -+ LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ - fi \ - ) > $@ - diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch deleted file mode 100644 index 007b2b5c1e3a..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/scripts/lvm2create_initrd/lvm2create_initrd -+++ b/scripts/lvm2create_initrd/lvm2create_initrd -@@ -54,7 +54,9 @@ - DEVRAM=/tmp/initrd.$$ - - # set defaults --BINFILES=${BINFILES:-"`which lvm` `which bash` `which busybox` `which pivot_root`"} -+LVM=`which lvm.static` -+LVM=${LVM:-"`which lvm`"} -+BINFILES=${BINFILES:-"${LVM} `which bash` `which busybox` `which pivot_root`"} - BASICDEVICES=${BASICDEVICES:-"std consoleonly fd"} - BLOCKDEVICES=${BLOCKDEVICES:-"md hda hdb hdc hdd sda sdb sdc sdd"} - MAKEDEV=${MAKEDEV:-"debian"} -@@ -119,6 +121,10 @@ - echo "$PRE Mounting /proc" - mount -t proc none /proc - -+# We need /sys for lvm -+echo "$PRE Mounting /sys" -+mount -t sysfs sysfs /sys -+ - # plug in modules listed in /etc/modules - if [ -f /etc/modules ]; then - echo -n "$PRE plugging in kernel modules:" -@@ -179,26 +185,29 @@ - # run a shell if we're passed lvm2rescue on commandline - grep lvm2rescue /proc/cmdline 1>/dev/null 2>&1 - if [ $? -eq 0 ]; then -- lvm vgchange --ignorelockingfailure -P -a y -+ $LVM vgchange --ignorelockingfailure -P -a y - do_shell - else -- lvm vgchange --ignorelockingfailure -a y -+ $LVM vgchange --ignorelockingfailure -a y - fi - - echo "$PRE Mounting root filesystem $rootvol ro" - mkdir /rootvol - if ! mount -t auto -o ro $rootvol /rootvol; then -- echo "\t*FAILED*"; -+ echo "\t*FAILED TRYING TO MOUNT ROOTVOL*"; - do_shell - fi - - echo "$PRE Umounting /proc" - umount /proc - -+echo "$PRE Umounting /sys" -+umount /sys -+ - echo "$PRE Changing roots" - cd /rootvol - if ! pivot_root . initrd ; then -- echo "\t*FAILED*" -+ echo "\t*FAILED PIVOT TO NEW ROOT*" - do_shell - fi - -@@ -356,7 +365,7 @@ - fi - - verbose "creating basic set of directories in $TMPMNT" --(cd $TMPMNT; mkdir bin dev etc lib proc sbin var) -+(cd $TMPMNT; mkdir bin dev etc lib proc sbin sys var) - if [ $? -ne 0 ]; then - echo "$cmd -- ERROR creating directories in $TMPMNT" - cleanup 1 -@@ -460,9 +469,9 @@ - rmdir $TMPMNT/lost+found - - echo "$cmd -- ummounting ram disk" --umount $DEVRAM -+umount $TMPMNT - if [ $? -ne 0 ]; then -- echo "$cmd -- ERROR umounting $DEVRAM" -+ echo "$cmd -- ERROR umounting $TMPMNT" - cleanup 1 - fi - |