From 145a7d6271602091b6a3f48e1dc0fbba3d6540ed Mon Sep 17 00:00:00 2001
From: r00t <bts@square-r00t.net>
Date: Wed, 6 May 2015 18:12:26 -0400
Subject: [PATCH] changing default to run from media, not RAM)

---
 lib/08-stuffy.func.sh | 12 ++++++------
 lib/09-yo_dj.func.sh  | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/08-stuffy.func.sh b/lib/08-stuffy.func.sh
index 7fcacd7..875376a 100644
--- a/lib/08-stuffy.func.sh
+++ b/lib/08-stuffy.func.sh
@@ -32,16 +32,16 @@ function stuffy {
   # now for setting up loader config/entries. maybe add memtest or something in the future? i dunno.
   cat > ${TEMPDIR}/loader/loader.conf << EOF
 timeout 3
-default ${UXNAME}_ram
+default ${UXNAME}
 EOF
   cat > ${TEMPDIR}/loader/entries/${UXNAME}_ram.conf << EOF
-title   ${PNAME}
+title   ${PNAME} (RAM)
 linux   /boot/${UXNAME}.kern
 initrd  /boot/${UXNAME}.img
 options copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
 EOF
   cat > ${TEMPDIR}/loader/entries/${UXNAME}.conf << EOF
-title   ${PNAME} (Run from media)
+title   ${PNAME} (Media)
 linux   /boot/${UXNAME}.kern
 initrd  /boot/${UXNAME}.img
 options archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -73,16 +73,16 @@ EOF
   # GETTING DEJA VU HERE.
   cat > ${SRCDIR}/efiboot/loader/loader.conf << EOF
 timeout 3
-default ${UXNAME}_ram
+default ${UXNAME}
 EOF
   cat > ${SRCDIR}/efiboot/loader/entries/${UXNAME}_ram.conf << EOF
-title   ${PNAME}
+title   ${PNAME} (RAM)
 linux   /EFI/${DISTNAME}/${UXNAME}.efi
 initrd  /EFI/${DISTNAME}/${UXNAME}.img
 options copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
 EOF
   cat > ${SRCDIR}/efiboot/loader/entries/${UXNAME}.conf << EOF
-title   ${PNAME} (Run from media)
+title   ${PNAME} (Media)
 linux   /EFI/${DISTNAME}/${UXNAME}.efi
 initrd  /EFI/${DISTNAME}/${UXNAME}.img
 options archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
diff --git a/lib/09-yo_dj.func.sh b/lib/09-yo_dj.func.sh
index 749ce83..0bfdaa4 100644
--- a/lib/09-yo_dj.func.sh
+++ b/lib/09-yo_dj.func.sh
@@ -60,7 +60,7 @@ MENU BACKGROUND /${UXNAME}.png
 LABEL check
   MENU LABEL Your best supported kernel should be detected automatically.
   COM32 ifcpu64.c32
-  APPEND ${UXNAME}_ram_64 -- ${UXNAME}_ram_32
+  APPEND ${UXNAME}_64 -- ${UXNAME}_32
   MENU DEFAULT
 
 
@@ -84,10 +84,10 @@ MENU SEPARATOR
 ## 64 BIT
 MENU BEGIN 64BIT
 MENU LABEL ^1) 64-Bit ...
-ONTIMEOUT ${UXNAME}_ram_64
+ONTIMEOUT ${UXNAME}_64
   
 LABEL ${UXNAME}_ram_64
-  MENU LABEL ^1) ${PNAME} (run from RAM) (Default)
+  MENU LABEL ^1) ${PNAME} (run from RAM)
   LINUX /boot/${UXNAME}.64.kern
   INITRD /boot/${UXNAME}.64.img
   APPEND copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -97,7 +97,7 @@ LABEL ${UXNAME}_ram_64
   MENU DEFAULT
 
 LABEL ${UXNAME}_64 
-  MENU LABEL ^1) ${PNAME}
+  MENU LABEL ^1) ${PNAME} (Default)
   LINUX /boot/${UXNAME}.64.kern
   INITRD /boot/${UXNAME}.64.img
   APPEND archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -110,11 +110,11 @@ MENU END
 
 MENU BEGIN 32BIT
 MENU LABEL ^2) 32-Bit ...
-ONTIMEOUT ${UXNAME}_ram_32
+ONTIMEOUT ${UXNAME}_32
 
 ## 32 BIT
 LABEL ${UXNAME}_ram_32
-  MENU LABEL ^1) ${PNAME} (run from RAM) (Default)
+  MENU LABEL ^1) ${PNAME} (run from RAM)
   LINUX /boot/${UXNAME}.32.kern
   INITRD /boot/${UXNAME}.32.img
   APPEND copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -124,7 +124,7 @@ LABEL ${UXNAME}_ram_32
   MENU DEFAULT
 
 LABEL ${UXNAME}_32 
-  MENU LABEL ^2) ${PNAME}
+  MENU LABEL ^2) ${PNAME} (Default)
   LINUX /boot/${UXNAME}.32.kern
   INITRD /boot/${UXNAME}.32.img
   APPEND archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -188,10 +188,10 @@ MENU SEPARATOR
 
 MENU BEGIN ${ARCH}BIT
 MENU LABEL ^1) ${ARCH}-Bit ...
-ONTIMEOUT ${UXNAME}_ram_${ARCH}
+ONTIMEOUT ${UXNAME}_${ARCH}
   
 LABEL ${UXNAME}_ram_${ARCH}
-  MENU LABEL ^1) ${PNAME} (run from RAM) (Default)
+  MENU LABEL ^1) ${PNAME} (run from RAM)
   LINUX /boot/${UXNAME}.${ARCH}.kern
   INITRD /boot/${UXNAME}.${ARCH}.img
   APPEND copytoram archisobasedir=${DISTNAME} archisolabel=${DISTNAME}
@@ -201,7 +201,7 @@ LABEL ${UXNAME}_ram_${ARCH}
   MENU DEFAULT
 
 LABEL ${UXNAME}_${ARCH} 
-  MENU LABEL ^1) ${PNAME}
+  MENU LABEL ^1) ${PNAME} (Default)
   LINUX /boot/${UXNAME}.${ARCH}.kern
   INITRD /boot/${UXNAME}.${ARCH}.img
   APPEND archisobasedir=${DISTNAME} archisolabel=${DISTNAME}