[pve-devel] [PATCH v2 grub 2/5] remove leftover patches

[Fabian Grünbichler]

---
 pvepatches/fix-grub-distributor.patch   | 13 -------------
 pvepatches/grub-disable-os-prober.patch | 15 ---------------
 pvepatches/grub-disable-recovery.patch  | 15 ---------------
 pvepatches/series                       | 13 -------------
 4 files changed, 56 deletions(-)
 delete mode 100644 pvepatches/fix-grub-distributor.patch
 delete mode 100644 pvepatches/grub-disable-os-prober.patch
 delete mode 100644 pvepatches/grub-disable-recovery.patch

diff --git a/pvepatches/fix-grub-distributor.patch b/pvepatches/fix-grub-distributor.patch
deleted file mode 100644
index 629c9b7..0000000
--- a/pvepatches/fix-grub-distributor.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: new/debian/default/grub
-===================================================================
---- new.orig/debian/default/grub	2015-04-13 09:18:01.000000000 +0200
-+++ new/debian/default/grub	2015-04-14 08:31:16.000000000 +0200
-@@ -5,7 +5,7 @@
- 
- GRUB_DEFAULT=0
- GRUB_TIMEOUT=@DEFAULT_TIMEOUT@
--GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
-+GRUB_DISTRIBUTOR="Proxmox Virtual Environment"
- GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@"
- GRUB_CMDLINE_LINUX=""
- 
diff --git a/pvepatches/grub-disable-os-prober.patch b/pvepatches/grub-disable-os-prober.patch
deleted file mode 100644
index fa80197..0000000
--- a/pvepatches/grub-disable-os-prober.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: new/debian/default/grub
-===================================================================
---- new.orig/debian/default/grub
-+++ new/debian/default/grub
-@@ -9,6 +9,10 @@ GRUB_DISTRIBUTOR="Proxmox Virtual Enviro
- GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@"
- GRUB_CMDLINE_LINUX=""
- 
-+# Disable os-prober, it might add menu entries for each guest
-+# root FS on a local partition
-+GRUB_DISABLE_OS_PROBER=true
-+
- # Uncomment to enable BadRAM filtering, modify to suit your needs
- # This works with Linux (no patch required) and with any kernel that obtains
- # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
diff --git a/pvepatches/grub-disable-recovery.patch b/pvepatches/grub-disable-recovery.patch
deleted file mode 100644
index a5dea1f..0000000
--- a/pvepatches/grub-disable-recovery.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: new/debian/default/grub
-===================================================================
---- new.orig/debian/default/grub
-+++ new/debian/default/grub
-@@ -29,8 +29,8 @@ GRUB_DISABLE_OS_PROBER=true
- # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
- #GRUB_DISABLE_LINUX_UUID=true
- 
--# Uncomment to disable generation of recovery mode menu entries
--#GRUB_DISABLE_RECOVERY="true"
-+# Disable generation of recovery mode menu entries
-+GRUB_DISABLE_RECOVERY="true"
- 
- # Uncomment to get a beep at grub start
- #GRUB_INIT_TUNE="480 440 1"
diff --git a/pvepatches/series b/pvepatches/series
index 21be043..4a36287 100644
--- a/pvepatches/series
+++ b/pvepatches/series
@@ -1,18 +1,5 @@
 disable-unwanted-packages.patch
 fix-build-dependencies.patch
 fix-grub-pc-postinst.patch
-#fix-zfs-ldadd.patch
-#zfsinfo.c-memory-leak-in-print_vdev_info.patch
-#zfs.c-Avoid-divisions-by-zero.patch
-#zfs-Fix-disk-matching-logic.patch
-#zfs-Fix-error-handling.patch
-#zfscrypt-Add-missing-explicit-cast.patch
-#zfs.c-fix-memory-leak.patch
-#biosdisk-Add-missing-cast.patch
-#biosdisk.c-Check-disk-size-sanity.patch
-#ahci.c-Increase-timeout.patch
-#fix-grub-distributor.patch
 suggest-os-prober.patch
-#grub-disable-os-prober.patch
-#grub-disable-recovery.patch
 fix-default-grub-config.patch
-- 
2.1.4