From 1ffb37f09c7ad077f9d9863ced18d64eeef7520b Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 28 Jul 2008 15:05:51 -0700
Subject: [PATCH] Moving files from generic to defaults, since they are the
 defaults used globally.

---
 ChangeLog                             |   9 +++++++++
 {generic => defaults}/initrd.defaults |   0
 {generic => defaults}/initrd.scripts  |   0
 {generic => defaults}/keymaps.tar.gz  | Bin
 {generic => defaults}/linuxrc         |   0
 {generic => defaults}/modprobe        |   0
 {generic => defaults}/udhcpc.scripts  |   0
 gen_initramfs.sh                      |  28 +++++++++++++-------------
 8 files changed, 23 insertions(+), 14 deletions(-)
 rename {generic => defaults}/initrd.defaults (100%)
 rename {generic => defaults}/initrd.scripts (100%)
 rename {generic => defaults}/keymaps.tar.gz (100%)
 rename {generic => defaults}/linuxrc (100%)
 rename {generic => defaults}/modprobe (100%)
 rename {generic => defaults}/udhcpc.scripts (100%)

diff --git a/ChangeLog b/ChangeLog
index cecac3c..229bea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
 # Distributed under the GPL v2
 
+  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO,
+  +defaults/initrd.defaults, +defaults/initrd.scripts,
+  +defaults/keymaps.tar.gz, +defaults/linuxrc, +defaults/modprobe,
+  +defaults/udhcpc.scripts, gen_initramfs.sh, -generic/initrd.defaults,
+  -generic/initrd.scripts, -generic/keymaps.tar.gz, -generic/linuxrc,
+  -generic/modprobe, -generic/udhcpc.scripts:
+  Moving files from generic to defaults, since they are the defaults used
+  globally.
+
   28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO, +modules/README:
   Added the modules directory, which will be used to store the built-in
   modules and also for external entities to add their own modules and hooks.
diff --git a/generic/initrd.defaults b/defaults/initrd.defaults
similarity index 100%
rename from generic/initrd.defaults
rename to defaults/initrd.defaults
diff --git a/generic/initrd.scripts b/defaults/initrd.scripts
similarity index 100%
rename from generic/initrd.scripts
rename to defaults/initrd.scripts
diff --git a/generic/keymaps.tar.gz b/defaults/keymaps.tar.gz
similarity index 100%
rename from generic/keymaps.tar.gz
rename to defaults/keymaps.tar.gz
diff --git a/generic/linuxrc b/defaults/linuxrc
similarity index 100%
rename from generic/linuxrc
rename to defaults/linuxrc
diff --git a/generic/modprobe b/defaults/modprobe
similarity index 100%
rename from generic/modprobe
rename to defaults/modprobe
diff --git a/generic/udhcpc.scripts b/defaults/udhcpc.scripts
similarity index 100%
rename from generic/udhcpc.scripts
rename to defaults/udhcpc.scripts
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 23afc63..08e913b 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -40,7 +40,7 @@ append_busybox() {
 	fi
 	mkdir -p "${TEMP}/initramfs-busybox-temp/bin/" 
 
-	cp "${GK_SHARE}/generic/udhcpc.scripts" ${TEMP}/initramfs-busybox-temp/bin/
+	cp "${GK_SHARE}/defaults/udhcpc.scripts" ${TEMP}/initramfs-busybox-temp/bin/
 	chmod +x "${TEMP}/initramfs-busybox-temp/bin/udhcpc.scripts"
 	tar -xjf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox ||
 		gen_die 'Could not extract busybox bincache!'
@@ -351,11 +351,11 @@ append_auxilary() {
 		cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
 		print_info 2 "        >> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
 	else	
-		if [ -f "${GK_SHARE}/${ARCH}/linuxrc" ]
+		if [ -f "${GK_SHARE}/arch/${ARCH}/linuxrc" ]
 		then
-			cp "${GK_SHARE}/${ARCH}/linuxrc" "${TEMP}/initramfs-aux-temp/init"
+			cp "${GK_SHARE}/arch/${ARCH}/linuxrc" "${TEMP}/initramfs-aux-temp/init"
 		else
-			cp "${GK_SHARE}/generic/linuxrc" "${TEMP}/initramfs-aux-temp/init"
+			cp "${GK_SHARE}/defaults/linuxrc" "${TEMP}/initramfs-aux-temp/init"
 		fi
 	fi
 
@@ -368,18 +368,18 @@ append_auxilary() {
 	ln -s init linuxrc
 #	ln ${TEMP}/initramfs-aux-temp/init ${TEMP}/initramfs-aux-temp/linuxrc 
 
-	if [ -f "${GK_SHARE}/${ARCH}/initrd.scripts" ]
+	if [ -f "${GK_SHARE}/arch/${ARCH}/initrd.scripts" ]
 	then
-		cp "${GK_SHARE}/${ARCH}/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
+		cp "${GK_SHARE}/arch/${ARCH}/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
 	else	
-		cp "${GK_SHARE}/generic/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
+		cp "${GK_SHARE}/defaults/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
 	fi
 
-	if [ -f "${GK_SHARE}/${ARCH}/initrd.defaults" ]
+	if [ -f "${GK_SHARE}/arch/${ARCH}/initrd.defaults" ]
 	then
-		cp "${GK_SHARE}/${ARCH}/initrd.defaults" "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
+		cp "${GK_SHARE}/arch/${ARCH}/initrd.defaults" "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 	else
-		cp "${GK_SHARE}/generic/initrd.defaults" "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
+		cp "${GK_SHARE}/defaults/initrd.defaults" "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 	fi
 	
 	echo -n 'HWOPTS="$HWOPTS ' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"	
@@ -389,11 +389,11 @@ append_auxilary() {
 	done
 	echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"	
 
-	if [ -f "${GK_SHARE}/${ARCH}/modprobe" ]
+	if [ -f "${GK_SHARE}/arch/${ARCH}/modprobe" ]
 	then
-		cp "${GK_SHARE}/${ARCH}/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
+		cp "${GK_SHARE}/arch/${ARCH}/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
 	else
-		cp "${GK_SHARE}/generic/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
+		cp "${GK_SHARE}/defaults/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
 	fi
 	if isTrue $CMD_DOKEYMAPAUTO
 	then
@@ -402,7 +402,7 @@ append_auxilary() {
 	if isTrue $CMD_KEYMAP
 	then
 		mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
-		/bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+		/bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/defaults/keymaps.tar.gz"
 	fi
 	if isTrue $CMD_SLOWUSB
 	then
-- 
2.26.2