diff options
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/02defaults.sh | 13 | ||||
| -rw-r--r-- | src/scripts/14chroot.sh | 3 | ||||
| -rw-r--r-- | src/scripts/21image.sh | 17 |
3 files changed, 20 insertions, 13 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 9cc4c5a21..faca4769d 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -53,7 +53,7 @@ Defaults () # Set debian distribution if [ -z "${LIVE_DISTRIBUTION}" ] then - LIVE_DISTRIBUTION="testing" + LIVE_DISTRIBUTION="unstable" fi if [ "${LIVE_DISTRIBUTION}" = "experimental" ] @@ -86,7 +86,13 @@ Defaults () ;; amd64) - LIVE_KERNEL="amd64" + if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] + then + LIVE_KERNEL="amd64" + else + LIVE_KERNEL="amd64-generic" + fi ;; arm) @@ -99,7 +105,8 @@ Defaults () ;; i386) - if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] + if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ] then LIVE_KERNEL="386" else diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index cc24eecf6..2e2b489f0 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -156,6 +156,9 @@ Chroot () Chroot_exec "${LIVE_HOOK}" fi + # Temporary hacks for broken packages + Hack_xorg + # Add filesystem.manifest Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh index 5261867ec..36ca014a8 100644 --- a/src/scripts/21image.sh +++ b/src/scripts/21image.sh @@ -215,20 +215,17 @@ Syslinux () Linuximage () { - # Removing initrd backup files - rm -f "${LIVE_CHROOT}"/boot/initrd*bak* - case "${1}" in iso) # Copy linux-image if [ "${LIVE_FLAVOUR}" = "minimal" ] then - mv "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz - mv "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz + mv "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz + mv "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img else - cp "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz - cp "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz + cp "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz + cp "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz fi ;; @@ -236,10 +233,10 @@ Linuximage () # Copy linux-image if [ "${LIVE_FLAVOUR}" = "minimal" ] then - mv "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz - mv "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz + mv "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz + mv "${LIVE_ROOT}"/chroot/boot/initrd.img* "${LIVE_ROOT}"/tftpboot/initrd.gz else - cp "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz + cp "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz cp "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz fi ;; |