r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixing this stupid fucking patch. gorram whitespace tabs gorram it

Browse Source
This commit is contained in:
brent s. 2016-03-02 01:29:05 -05:00
parent e95c4f3cff
commit 001fdf99d3
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/10-yo_dj.func.sh
View File

@ -298,7 +298,7 @@ EOF
## Apply our patches. ## Apply our patches.
for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n' | sort); for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n' | sort);
do 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 done
## SSL ## SSL
SSLDIR="${BASEDIR}/src/ipxe_local/ssl" SSLDIR="${BASEDIR}/src/ipxe_local/ssl"

53
src/ipxe_local/patches/ipxe-0002-banner.patch
View File

@ -1,35 +1,36 @@
--- a/usr/autoboot.c diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
+++ b/usr/autoboot.c index e93b015..758e187 100644
@@ -71,6 +71,7 @@ --- a/src/usr/autoboot.c
#define NORMAL "\033[0m" +++ b/src/usr/autoboot.c
#define BOLD "\033[1m" @@ -71,6 +71,7 @@ static int ( * is_autoboot_device ) ( struct net_device *netdev );
#define CYAN "\033[36m" #define NORMAL "\033[0m"
+#define BLUE "\033[34m" #define BOLD "\033[1m"
#define CYAN "\033[36m"
+#define BLUE "\033[34m"
/** The "scriptlet" setting */ /** The "scriptlet" setting */
const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = { const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = {
@@ -521,7 +522,6 @@ @@ -521,7 +522,6 @@ static int shell_banner ( void ) {
* @ret rc Return status code * @ret rc Return status code
*/ */
int ipxe ( struct net_device *netdev ) { int ipxe ( struct net_device *netdev ) {
- struct feature *feature; - struct feature *feature;
struct image *image; struct image *image;
char *scriptlet; char *scriptlet;
int rc; int rc;
@@ -538,11 +538,11 @@ @@ -538,11 +538,11 @@ int ipxe ( struct net_device *netdev ) {
* do so. * 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 " %s"
+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME + printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
NORMAL " -- " PRODUCT_TAG_LINE " -- " NORMAL " -- " PRODUCT_TAG_LINE " -- "
- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version ); - CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
- for_each_table_entry ( feature, FEATURES ) - for_each_table_entry ( feature, FEATURES )
- printf ( " %s", feature->name ); - printf ( " %s", feature->name );
+ CYAN PRODUCT_URI NORMAL "\n" + CYAN PRODUCT_URI NORMAL "\n"
+ BOLD "BDisk" BLUE "LiveDistro" NORMAL " -- Welp, Yer Boned!(TM) -- " + BOLD "BDisk" BLUE "LiveDistro" NORMAL " -- Welp, Yer Boned!(TM) -- "
+ BOLD BLUE "https://bdisk.square-r00t.net/" NORMAL "\n" ); + BOLD BLUE "https://bdisk.square-r00t.net/" NORMAL "\n" );
printf ( "\n" ); printf ( "\n" );
/* Boot system */ /* Boot system */