From 001fdf99d3b24bc59be8e695cf73dfbc8ba632d5 Mon Sep 17 00:00:00 2001 From: r00t Date: Wed, 2 Mar 2016 01:29:05 -0500 Subject: [PATCH] fixing this stupid fucking patch. gorram whitespace tabs gorram it --- lib/10-yo_dj.func.sh | 2 +- src/ipxe_local/patches/ipxe-0002-banner.patch | 53 ++++++++++--------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/lib/10-yo_dj.func.sh b/lib/10-yo_dj.func.sh index a8f4701..7c1a8da 100644 --- a/lib/10-yo_dj.func.sh +++ b/lib/10-yo_dj.func.sh @@ -298,7 +298,7 @@ EOF ## Apply our patches. for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n' | sort); do - patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1 + patch --verbose -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1 done ## SSL SSLDIR="${BASEDIR}/src/ipxe_local/ssl" diff --git a/src/ipxe_local/patches/ipxe-0002-banner.patch b/src/ipxe_local/patches/ipxe-0002-banner.patch index 1107f90..aaead6d 100644 --- a/src/ipxe_local/patches/ipxe-0002-banner.patch +++ b/src/ipxe_local/patches/ipxe-0002-banner.patch @@ -1,35 +1,36 @@ ---- a/usr/autoboot.c -+++ b/usr/autoboot.c -@@ -71,6 +71,7 @@ - #define NORMAL "\033[0m" - #define BOLD "\033[1m" - #define CYAN "\033[36m" -+#define BLUE "\033[34m" +diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c +index e93b015..758e187 100644 +--- a/src/usr/autoboot.c ++++ b/src/usr/autoboot.c +@@ -71,6 +71,7 @@ static int ( * is_autoboot_device ) ( struct net_device *netdev ); + #define NORMAL "\033[0m" + #define BOLD "\033[1m" + #define CYAN "\033[36m" ++#define BLUE "\033[34m" /** The "scriptlet" setting */ const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = { -@@ -521,7 +522,6 @@ - * @ret rc Return status code +@@ -521,7 +522,6 @@ static int shell_banner ( void ) { + * @ret rc Return status code */ int ipxe ( struct net_device *netdev ) { -- struct feature *feature; - struct image *image; - char *scriptlet; - int rc; -@@ -538,11 +538,11 @@ - * do so. - * - */ -- printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s" -+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME - NORMAL " -- " PRODUCT_TAG_LINE " -- " -- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version ); -- for_each_table_entry ( feature, FEATURES ) -- printf ( " %s", feature->name ); +- struct feature *feature; + struct image *image; + char *scriptlet; + int rc; +@@ -538,11 +538,11 @@ int ipxe ( struct net_device *netdev ) { + * do so. + * + */ +- printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s" ++ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME + NORMAL " -- " PRODUCT_TAG_LINE " -- " +- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version ); +- for_each_table_entry ( feature, FEATURES ) +- printf ( " %s", feature->name ); + CYAN PRODUCT_URI NORMAL "\n" + BOLD "BDisk" BLUE "LiveDistro" NORMAL " -- Welp, Yer Boned!(TM) -- " + BOLD BLUE "https://bdisk.square-r00t.net/" NORMAL "\n" ); - printf ( "\n" ); + printf ( "\n" ); - /* Boot system */ - + /* Boot system */