From 447c0d1349b4c96c9161f837990cd9c98f7c5ced Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Tue, 6 Dec 2011 22:11:21 +0100 Subject: [PATCH] Automatically refresh patches that need it --- debian/patches/03_grml_version_file_hook.patch | 8 ++++---- debian/patches/12_uuid_support.patch | 12 ++++++------ debian/patches/14_no_blkid_on_lenny.patch | 8 ++++---- ...9_revert_toram_bootoption_to_expected_behaviour.patch | 10 +++++----- debian/patches/27_support_static_ip.patch | 16 ++++++++-------- debian/patches/29_support_dns_in_initramfs.patch | 8 ++++---- debian/patches/30_support_multiarch_dns.patch | 8 ++++---- debian/patches/32_add_kms.patch | 6 ++++-- 8 files changed, 39 insertions(+), 37 deletions(-) diff --git a/debian/patches/03_grml_version_file_hook.patch b/debian/patches/03_grml_version_file_hook.patch index fd7a7e5..795f2d4 100644 --- a/debian/patches/03_grml_version_file_hook.patch +++ b/debian/patches/03_grml_version_file_hook.patch @@ -6,10 +6,10 @@ @DPATCH@ -Index: b/hooks/live +Index: live-boot-grml/hooks/live =================================================================== ---- a/hooks/live 2011-07-24 22:07:22.000000000 +0200 -+++ b/hooks/live 2011-07-24 22:07:55.000000000 +0200 +--- live-boot-grml.orig/hooks/live 2011-12-06 22:10:13.000000000 +0100 ++++ live-boot-grml/hooks/live 2011-12-06 22:10:17.000000000 +0100 @@ -40,6 +40,12 @@ done fi @@ -22,4 +22,4 @@ Index: b/hooks/live + # Handling live-boot - [ "${QUIET}" ] || echo -n " "core + if [ ! -e /usr/share/live-boot ] diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch index 0a60612..f241bba 100644 --- a/debian/patches/12_uuid_support.patch +++ b/debian/patches/12_uuid_support.patch @@ -12,10 +12,10 @@ ## DP: * no bootid.txt + ignore_bootid=... => boots @DPATCH@ -Index: b/scripts/live +Index: live-boot-grml/scripts/live =================================================================== ---- a/scripts/live 2011-07-24 22:08:02.000000000 +0200 -+++ b/scripts/live 2011-07-24 22:08:03.000000000 +0200 +--- live-boot-grml.orig/scripts/live 2011-12-06 22:10:24.000000000 +0100 ++++ live-boot-grml/scripts/live 2011-12-06 22:10:25.000000000 +0100 @@ -63,6 +63,11 @@ export ACCESS ;; @@ -40,7 +40,7 @@ Index: b/scripts/live ignore_uuid) IGNORE_UUID="Yes" export IGNORE_UUID -@@ -410,6 +420,42 @@ +@@ -457,6 +467,42 @@ return 1 } @@ -83,7 +83,7 @@ Index: b/scripts/live matches_uuid () { if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ] -@@ -1655,7 +1701,7 @@ +@@ -1785,7 +1831,7 @@ fi if is_live_path ${mountpoint} && \ @@ -92,7 +92,7 @@ Index: b/scripts/live then echo ${mountpoint} return 0 -@@ -1769,19 +1815,6 @@ +@@ -1881,19 +1927,6 @@ return 0 fi done diff --git a/debian/patches/14_no_blkid_on_lenny.patch b/debian/patches/14_no_blkid_on_lenny.patch index 22bc752..adc283e 100644 --- a/debian/patches/14_no_blkid_on_lenny.patch +++ b/debian/patches/14_no_blkid_on_lenny.patch @@ -8,11 +8,11 @@ ## DP: /lib/udev/vol_id in /scripts/live as well @DPATCH@ -Index: b/scripts/live +Index: live-boot-grml/scripts/live =================================================================== ---- a/scripts/live 2011-07-24 22:08:03.000000000 +0200 -+++ b/scripts/live 2011-07-24 22:08:06.000000000 +0200 -@@ -1680,7 +1680,12 @@ +--- live-boot-grml.orig/scripts/live 2011-12-06 22:10:25.000000000 +0100 ++++ live-boot-grml/scripts/live 2011-12-06 22:10:30.000000000 +0100 +@@ -1810,7 +1810,12 @@ if is_supported_fs ${fstype} then diff --git a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch index 627f709..2f78fb2 100644 --- a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch +++ b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch @@ -27,11 +27,11 @@ @DPATCH@ index d79beed..1b6926e 100755 -Index: b/scripts/live +Index: live-boot-grml/scripts/live =================================================================== ---- a/scripts/live 2011-07-24 22:08:09.000000000 +0200 -+++ b/scripts/live 2011-07-24 22:08:10.000000000 +0200 -@@ -563,7 +563,7 @@ +--- live-boot-grml.orig/scripts/live 2011-12-06 22:10:34.000000000 +0100 ++++ live-boot-grml/scripts/live 2011-12-06 22:10:34.000000000 +0100 +@@ -619,7 +619,7 @@ if [ -z "${MODULETORAM}" ] then @@ -40,7 +40,7 @@ Index: b/scripts/live else MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}" -@@ -639,8 +639,7 @@ +@@ -695,8 +695,7 @@ echo " * Copying whole medium to RAM" 1>/dev/console rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console # "cp -a" from busybox also copies hidden files else diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch index fb99ba6..0ba3c7f 100644 --- a/debian/patches/27_support_static_ip.patch +++ b/debian/patches/27_support_static_ip.patch @@ -6,10 +6,10 @@ @DPATCH@ -Index: b/scripts/live +Index: live-boot-grml/scripts/live =================================================================== ---- a/scripts/live 2011-07-24 22:08:13.000000000 +0200 -+++ b/scripts/live 2011-07-24 22:08:14.000000000 +0200 +--- live-boot-grml.orig/scripts/live 2011-12-06 22:10:37.000000000 +0100 ++++ live-boot-grml/scripts/live 2011-12-06 22:10:39.000000000 +0100 @@ -110,9 +110,8 @@ ;; @@ -39,7 +39,7 @@ Index: b/scripts/live export STATICIP ;; -@@ -667,6 +662,24 @@ +@@ -723,6 +718,24 @@ return 0 } @@ -64,7 +64,7 @@ Index: b/scripts/live do_netsetup () { modprobe -q af_packet # For DHCP -@@ -677,9 +690,19 @@ +@@ -733,9 +746,19 @@ [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15 echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration." @@ -87,7 +87,7 @@ Index: b/scripts/live # support for Syslinux IPAPPEND parameter -@@ -722,7 +745,7 @@ +@@ -778,7 +801,7 @@ if [ "$bootif_mac" = "$current_mac" ] then @@ -96,7 +96,7 @@ Index: b/scripts/live break fi fi -@@ -734,12 +757,7 @@ +@@ -790,12 +813,7 @@ # for *every* present network device (except for loopback of course) if [ -z "$ETHDEVICE" ] ; then echo "If you want to boot from a specific device use bootoption ethdevice=..." @@ -110,7 +110,7 @@ Index: b/scripts/live fi # split args of ethdevice=eth0,eth1 into "eth0 eth1" -@@ -747,38 +765,27 @@ +@@ -803,38 +821,27 @@ devlist="$devlist $device" done diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch index 33248d7..e5414fd 100644 --- a/debian/patches/29_support_dns_in_initramfs.patch +++ b/debian/patches/29_support_dns_in_initramfs.patch @@ -6,11 +6,11 @@ Date: Fri Mar 25 23:02:38 2011 +0100 Thanks to Ulrich Dangel for discovering this. [Closes: issue848] -Index: b/hooks/live +Index: live-boot-grml/hooks/live =================================================================== ---- a/hooks/live 2011-07-24 22:07:55.000000000 +0200 -+++ b/hooks/live 2011-07-24 22:08:17.000000000 +0200 -@@ -258,17 +258,14 @@ +--- live-boot-grml.orig/hooks/live 2011-12-06 22:10:17.000000000 +0100 ++++ live-boot-grml/hooks/live 2011-12-06 22:10:47.000000000 +0100 +@@ -266,17 +266,14 @@ manual_add_modules crc32c fi diff --git a/debian/patches/30_support_multiarch_dns.patch b/debian/patches/30_support_multiarch_dns.patch index 90bd12b..599a91b 100644 --- a/debian/patches/30_support_multiarch_dns.patch +++ b/debian/patches/30_support_multiarch_dns.patch @@ -12,11 +12,11 @@ Date: Tue Jun 7 10:15:52 2011 +0200 /lib/libnss_dns.so.* but could also be e.g. /lib/x86_64-linux-gnu/libnss_dns.so.*. -Index: b/hooks/live +Index: live-boot-grml/hooks/live =================================================================== ---- a/hooks/live 2011-07-24 22:08:17.000000000 +0200 -+++ b/hooks/live 2011-07-24 22:08:18.000000000 +0200 -@@ -260,7 +260,16 @@ +--- live-boot-grml.orig/hooks/live 2011-12-06 22:10:47.000000000 +0100 ++++ live-boot-grml/hooks/live 2011-12-06 22:10:55.000000000 +0100 +@@ -268,7 +268,16 @@ # DNS for initramfs #copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd diff --git a/debian/patches/32_add_kms.patch b/debian/patches/32_add_kms.patch index ef2f35a..f1d3dbb 100644 --- a/debian/patches/32_add_kms.patch +++ b/debian/patches/32_add_kms.patch @@ -1,5 +1,7 @@ ---- /dev/null -+++ b/hooks/kms +Index: live-boot-grml/hooks/kms +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ live-boot-grml/hooks/kms 2011-12-06 22:09:55.000000000 +0100 @@ -0,0 +1,25 @@ +#!/bin/sh +# hook for adding kms modules -- 2.1.4