diff options
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/02defaults.sh | 11 | ||||
| -rw-r--r-- | src/scripts/14chroot.sh | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 410332c..9cc4c5a 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -86,13 +86,7 @@ Defaults () ;; 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 + LIVE_KERNEL="amd64" ;; arm) @@ -105,8 +99,7 @@ Defaults () ;; i386) - if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \ - [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ] + if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] then LIVE_KERNEL="386" else diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index 2e2b489..cc24eec 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -156,9 +156,6 @@ 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 |