diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index 6354726..22ea137 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -166,10 +166,8 @@ if [ "x${conf_smart_uboot}" = "xenable" ] ; then if [ "x${bootdrive}" = "x${rootdrive}" ] ; then rm -f /boot/uboot/boot/uEnv.txt || true else + touch /boot/uboot/boot/trampoline.uboot wfile="/boot/uboot/boot/uEnv.txt" - - cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current - cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current fi fi @@ -185,4 +183,13 @@ if [ ! "x${optargs}" = "x" ] ; then fi fi +if [ -f /boot/uboot/boot/trampoline.uboot ] ; then + cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current + cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current + if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then + cp /boot/uboot/uImage /boot/uboot/boot/uImage + cp /boot/uboot/uInitrd /boot/uboot/boot/uInitrd + fi +fi + # diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh index b78e5c8..0c50d9a 100644 --- a/lib/ubuntu-finish.sh +++ b/lib/ubuntu-finish.sh @@ -136,10 +136,8 @@ if [ "x${conf_smart_uboot}" = "xenable" ] ; then if [ "x${bootdrive}" = "x${rootdrive}" ] ; then rm -f /boot/uboot/boot/uEnv.txt || true else + touch /boot/uboot/boot/trampoline.uboot wfile="/boot/uboot/boot/uEnv.txt" - - cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current - cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current fi fi @@ -155,4 +153,13 @@ if [ ! "x${optargs}" = "x" ] ; then fi fi +if [ -f /boot/uboot/boot/trampoline.uboot ] ; then + cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current + cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current + if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then + cp /boot/uboot/uImage /boot/uboot/boot/uImage + cp /boot/uboot/uInitrd /boot/uboot/boot/uInitrd + fi +fi + # diff --git a/mk_mmc.sh b/mk_mmc.sh index 778d0ac..6cb279f 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -980,6 +980,7 @@ populate_boot () { cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/boot/vmlinuz-current if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then + touch ${TEMPDIR}/disk/boot/trampoline.uboot if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net else