Moving files from generic to defaults, since they are the defaults used globally.

cleanup-cruft
Chris Gianelloni 17 years ago
parent 73e34e757e
commit 1ffb37f09c

@ -2,6 +2,15 @@
# Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
# Distributed under the GPL v2 # 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: 28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO, +modules/README:
Added the modules directory, which will be used to store the built-in 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. modules and also for external entities to add their own modules and hooks.

@ -40,7 +40,7 @@ append_busybox() {
fi fi
mkdir -p "${TEMP}/initramfs-busybox-temp/bin/" 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" chmod +x "${TEMP}/initramfs-busybox-temp/bin/udhcpc.scripts"
tar -xjf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox || tar -xjf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox ||
gen_die 'Could not extract busybox bincache!' gen_die 'Could not extract busybox bincache!'
@ -351,11 +351,11 @@ append_auxilary() {
cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init" cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
print_info 2 " >> Copying user specified linuxrc: ${CMD_LINUXRC} to init" print_info 2 " >> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
else else
if [ -f "${GK_SHARE}/${ARCH}/linuxrc" ] if [ -f "${GK_SHARE}/arch/${ARCH}/linuxrc" ]
then then
cp "${GK_SHARE}/${ARCH}/linuxrc" "${TEMP}/initramfs-aux-temp/init" cp "${GK_SHARE}/arch/${ARCH}/linuxrc" "${TEMP}/initramfs-aux-temp/init"
else else
cp "${GK_SHARE}/generic/linuxrc" "${TEMP}/initramfs-aux-temp/init" cp "${GK_SHARE}/defaults/linuxrc" "${TEMP}/initramfs-aux-temp/init"
fi fi
fi fi
@ -368,18 +368,18 @@ append_auxilary() {
ln -s init linuxrc ln -s init linuxrc
# ln ${TEMP}/initramfs-aux-temp/init ${TEMP}/initramfs-aux-temp/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 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 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 fi
if [ -f "${GK_SHARE}/${ARCH}/initrd.defaults" ] if [ -f "${GK_SHARE}/arch/${ARCH}/initrd.defaults" ]
then 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 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 fi
echo -n 'HWOPTS="$HWOPTS ' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults" echo -n 'HWOPTS="$HWOPTS ' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
@ -389,11 +389,11 @@ append_auxilary() {
done done
echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults" echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
if [ -f "${GK_SHARE}/${ARCH}/modprobe" ] if [ -f "${GK_SHARE}/arch/${ARCH}/modprobe" ]
then 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 else
cp "${GK_SHARE}/generic/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe" cp "${GK_SHARE}/defaults/modprobe" "${TEMP}/initramfs-aux-temp/sbin/modprobe"
fi fi
if isTrue $CMD_DOKEYMAPAUTO if isTrue $CMD_DOKEYMAPAUTO
then then
@ -402,7 +402,7 @@ append_auxilary() {
if isTrue $CMD_KEYMAP if isTrue $CMD_KEYMAP
then then
mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps" 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 fi
if isTrue $CMD_SLOWUSB if isTrue $CMD_SLOWUSB
then then

Loading…
Cancel
Save